ENGCOM-5418: Media gallery loaded twice #23621

Author: sidolov

lib/web/mage/adminhtml/browser.js

@@ -18,6 +18,7 @@ define([
 ], function ($, wysiwyg, prompt, confirm, alert) {
     window.MediabrowserUtility = {
         windowId: 'modal_dialog_message',
+        modalLoaded: false,
 
         /**
          * @return {Number}
@@ -51,6 +52,15 @@ define([
                 content = '<div class="popup-window" id="' + windowId + '"></div>',
                 self = this;
 
+            if (this.modalLoaded === true) {
+                if (options && typeof options.closed !== 'undefined') {
+                    this.modal.modal('option', 'closed', options.closed);
+                }
+                this.modal.modal('openModal');
+
+                return;
+            }
+
             if (this.modal) {
                 this.modal.html($(content).html());
 
@@ -74,6 +84,7 @@ define([
 
             }).done(function (data) {
                 self.modal.html(data).trigger('contentUpdated');
+                self.modalLoaded = true;
             });
         },
 

lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js

@@ -117,6 +117,7 @@ define([
             jQuery.when.apply(jQuery, deferreds).done(function () {
                 tinyMCE4.init(settings);
                 this.getPluginButtons().hide();
+                varienGlobalEvents.clearEventHandlers('open_browser_callback');
                 this.eventBus.attachEventHandler('open_browser_callback', tinyMceEditors.get(self.id).openFileBrowser);
             }.bind(this));
         },