#27566: Do not re-load the gallery app, just content

Author: Stanislav Idolov

lib/web/mage/adminhtml/browser.js

@@ -53,20 +53,14 @@ define([
                 content = '<div class="popup-window" id="' + windowId + '"></div>',
                 self = this;
 
-            if (options &&
-                self.targetElementId &&
-                self.targetElementId === options.targetElementId) {
+            if (this.modalLoaded) {
+
                 if (typeof options.closed !== 'undefined') {
                     this.modal.modal('option', 'closed', options.closed);
                 }
-                this.modal.modal('openModal');
 
-                return;
-            } else if (_.isUndefined(options) &&
-                    self.modalLoaded === true &&
-                    self.targetElementId === url
-            ) {
                 this.modal.modal('openModal');
+                $(window).trigger('reload.MediaGallery');
 
                 return;
             }
@@ -95,9 +89,6 @@ define([
             }).done(function (data) {
                 self.modal.html(data).trigger('contentUpdated');
                 self.modalLoaded = true;
-                self.targetElementId = options ?
-                           options.targetElementId
-                           : url;
             });
 
         },
@@ -140,7 +131,8 @@ define([
                 'click #delete_files': 'deleteFiles',
                 'click #insert_files': 'insertSelectedFiles',
                 'fileuploaddone': '_uploadDone',
-                'click [data-row=breadcrumb]': 'selectFolder'
+                'click [data-row=breadcrumb]': 'selectFolder',
+                'reload.MediaGallery': 'reload'
             });
             this.activeNode = null;
             //tree dont use event bubbling