Revert "Fixing cancel button not actually closing the popup window"

This reverts commit d0d4416.
enigmatic-user · Aug 1, 2016 · 2ea13cd · 2ea13cd
1 parent 7cc4571
commit 2ea13cd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/assets/components/tinymce/tiny.browser.js b/assets/components/tinymce/tiny.browser.js
@@ -16,21 +16,11 @@ Tiny.browserCallback = function(data) {
                 win.ImageDialog.showPreviewImage(url);
             }
 
-            /* close */
-            this.close();
-        },
-        close: function () {
             /* close popup window */
             tinyMCEPopup.close();
             win.focus(); win.document.focus();
         }
     };
-
-    if (data === null) {
-        FileBrowserDialogue.close();
-        return;
-    }
-
     var fileUrl;
     if (inRevo20) {
         fileUrl = unescape(data.relativeUrl);

diff --git a/core/components/tinymce/docs/changelog.txt b/core/components/tinymce/docs/changelog.txt
@@ -4,7 +4,6 @@ development release, and is only shown to give an idea of what's currently in th
 
 TinyMCE 4.3.4
 ====================================
-- Fix cancel button not actually closing the popup window
 - Use modx->controller->addJavascript/addHtml/etc to fix issue in MODX Revolution 2.5.1
 
 TinyMCE 4.3.3