MAGETWO-44873: Media Storage window opens behind "Insert/Edit Image" dialog

Author: Dmytro Poperechnyy

lib/web/mage/adminhtml/browser.js

@@ -37,12 +37,12 @@ define([
             if (this.modal) {
                 this.modal.html($(content).html());
             } else {
-                this.modal = $(content).modal({
+                this.modal = $(content).modal($.extend({
                     title:  title || 'Insert File...',
                     modalClass: 'magento',
                     type: 'slide',
                     buttons: []
-                });
+                }, options));
             }
             this.modal.modal('openModal');
             $.ajax({

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

@@ -155,9 +155,10 @@ define([
         },
 
         openFileBrowser: function(o) {
-            var typeTitle;
-            var storeId = this.config.store_id !== null ? this.config.store_id : 0;
-            var wUrl = this.config.files_browser_window_url +
+            var typeTitle,
+                storeId = this.config.store_id !== null ? this.config.store_id : 0,
+                frameDialog = jQuery(o.win.frameElement).parents('[role="dialog"]'),
+                wUrl = this.config.files_browser_window_url +
                 'target_element_id/' + this.id + '/' +
                 'store/' + storeId + '/';
 
@@ -171,11 +172,13 @@ define([
                 typeTitle = this.translate('Insert File...');
             }
 
+            frameDialog.hide();
+            jQuery('#mceModalBlocker').hide();
+
             MediabrowserUtility.openDialog(wUrl, false, false, typeTitle, {
-                onBeforeShow: function(win) {
-                    win.element.setStyle({
-                        zIndex: 1100
-                    });
+                closed: function() {
+                    frameDialog.show();
+                    jQuery('#mceModalBlocker').show();
                 }
             });
         },