Fixing cancel button not actually closing the popup window

Author: OptimusCrime

assets/components/tinymce/tiny.browser.js

@@ -16,11 +16,21 @@ 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);