Merge remote-tracking branch 'tango-branch/MAGETWO-44987-pr' into MAGETWO-40172

Susan Wright · Susan Wright · commit 6431fbeb060b · 2015-11-04T11:38:17.000-06:00
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_index_index.xml
@@ -6,9 +6,6 @@
  */
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <head>
-        <script src="Magento_Checkout/js/checkout-loader.js"/>
-    </head>
     <body>
         <referenceContainer name="content">
             <block class="Magento\Checkout\Block\Onepage" name="checkout.root" template="onepage.phtml" cacheable="false">
diff --git a/app/code/Magento/Checkout/view/frontend/requirejs-config.js b/app/code/Magento/Checkout/view/frontend/requirejs-config.js
@@ -9,7 +9,13 @@ var config = {
             discountCode:           'Magento_Checkout/js/discount-codes',
             shoppingCart:           'Magento_Checkout/js/shopping-cart',
             regionUpdater:          'Magento_Checkout/js/region-updater',
-            sidebar:                'Magento_Checkout/js/sidebar'
+            sidebar:                'Magento_Checkout/js/sidebar',
+            checkoutLoader:         'Magento_Checkout/js/checkout-loader',
+            checkoutData:           'Magento_Checkout/js/checkout-data',
+            proceedToCheckout:      'Magento_Checkout/js/proceed-to-checkout'
         }
-    }
+    },
+    deps: [
+        "Magento_Checkout/js/checkout-loader"
+    ]
 };
diff --git a/lib/web/mage/adminhtml/browser.js b/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({
diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js b/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();
                 }
             });
         },
