Merge branch '2.3-develop' into 2.3-bugfixes-220318

magento · Mar 24, 2018 · 2c3ff92 · 2c3ff92
2 parents 93efd27 + 068a97e
commit 2c3ff92
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 44 deletions.
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php
@@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editGroup', ['group_id' => $row->getGroupId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />'
+        . '(' . __('Code') . ': ' . $row->getGroupCode() . ')';
     }
 }
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php
@@ -27,6 +27,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editStore', ['store_id' => $row->getStoreId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />' .
+        '(' . __('Code') . ': ' . $row->getStoreCode() . ')';
     }
 }
diff --git a/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php b/app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php
@@ -24,6 +24,7 @@ public function render(\Magento\Framework\DataObject $row)
         $this->getUrl('adminhtml/*/editWebsite', ['website_id' => $row->getWebsiteId()]) .
         '">' .
         $this->escapeHtml($row->getData($this->getColumn()->getIndex())) .
-        '</a>';
+        '</a><br />' .
+        '(' . __('Code') . ': ' . $row->getCode() . ')';
     }
 }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js b/app/code/Magento/Checkout/view/frontend/web/js/model/step-navigator.js
@@ -144,7 +144,7 @@ define([
          */
         navigateTo: function (code, scrollToElementId) {
             var sortedItems = steps().sort(this.sortItems),
-                bodyElem = $.browser.safari || $.browser.chrome ? $('body') : $('html');
+                bodyElem = $('body');
 
             scrollToElementId = scrollToElementId || null;
 

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js b/app/code/Magento/Checkout/view/frontend/web/js/view/progress-bar.js
@@ -8,8 +8,7 @@ define([
     'underscore',
     'ko',
     'uiComponent',
-    'Magento_Checkout/js/model/step-navigator',
-    'jquery/jquery.hashchange'
+    'Magento_Checkout/js/model/step-navigator'
 ], function ($, _, ko, Component, stepNavigator) {
     'use strict';
 
@@ -25,7 +24,7 @@ define([
         /** @inheritdoc */
         initialize: function () {
             this._super();
-            $(window).hashchange(_.bind(stepNavigator.handleHash, stepNavigator));
+            window.addEventListener('hashchange', _.bind(stepNavigator.handleHash, stepNavigator));
             stepNavigator.handleHash();
         },
 

diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/edit.phtml
@@ -32,7 +32,6 @@
 require([
     "jquery",
     "uiRegistry",
-    "jquery/jquery.hashchange",
     "mage/mage",
     "prototype",
     "mage/adminhtml/form",
@@ -379,7 +378,7 @@ require([
         return false;
     };
 
-    jQuery(window).hashchange(handleHash);
+    window.addEventListener('hashchange', handleHash);
     handleHash();
 
     registry.set('adminSystemConfig', adminSystemConfig);

diff --git a/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php b/app/code/Magento/Integration/Controller/Adminhtml/Integration/LoginSuccessCallback.php
@@ -15,6 +15,6 @@ class LoginSuccessCallback extends \Magento\Integration\Controller\Adminhtml\Int
      */
     public function execute()
     {
-        $this->getResponse()->setBody('<script>setTimeout("self.close()",1000);</script>');
+        $this->getResponse()->setBody('<script>setTimeout(self.close.bind(this), 1000);</script>');
     }
 }
diff --git a/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php b/app/code/Magento/Store/Model/ResourceModel/Website/Collection.php
@@ -138,11 +138,11 @@ public function joinGroupAndStore()
             $this->getSelect()->joinLeft(
                 ['group_table' => $this->getTable('store_group')],
                 'main_table.website_id = group_table.website_id',
-                ['group_id' => 'group_id', 'group_title' => 'name']
+                ['group_id' => 'group_id', 'group_title' => 'name', 'group_code' => 'code']
             )->joinLeft(
                 ['store_table' => $this->getTable('store')],
                 'group_table.group_id = store_table.group_id',
-                ['store_id' => 'store_id', 'store_title' => 'name']
+                ['store_id' => 'store_id', 'store_title' => 'name', 'store_code' => 'code']
             );
             $this->addOrder('group_table.name', \Magento\Framework\DB\Select::SQL_ASC)       // store name
                 ->addOrder(

diff --git a/app/code/Magento/Theme/view/base/requirejs-config.js b/app/code/Magento/Theme/view/base/requirejs-config.js
@@ -15,7 +15,6 @@ var config = {
     },
     'shim': {
         'jquery/jquery-migrate': ['jquery'],
-        'jquery/jquery.hashchange': ['jquery', 'jquery/jquery-migrate'],
         'jquery/jstree/jquery.hotkeys': ['jquery'],
         'jquery/hover-intent': ['jquery'],
         'mage/adminhtml/backup': ['prototype'],
@@ -39,7 +38,6 @@ var config = {
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
-        'jquery/jquery.hashchange': 'jquery/jquery.ba-hashchange.min',
         'prototype': 'legacy-build.min',
         'jquery/jquery-storageapi': 'jquery/jquery.storageapi.min',
         'text': 'mage/requirejs/text',

diff --git a/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js b/app/code/Magento/Ui/view/base/web/js/lib/view/utils/raf.js
@@ -19,6 +19,9 @@ define([
         window.onRequestAnimationFrame ||
         window.msRequestAnimationFrame ||
         function (callback) {
+            if (typeof callback != 'function') {
+                throw new Error('raf argument "callback" must be of type function');
+            }
             window.setTimeout(callback, 1000 / 60);
         };
 

diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js
@@ -9,7 +9,6 @@
 require.config({
     'waitSeconds': 0,
     'shim': {
-        'jquery/jquery.hashchange': ['jquery'],
         'jquery/jstree/jquery.hotkeys': ['jquery'],
         'jquery/hover-intent': ['jquery'],
         'mage/adminhtml/backup': ['prototype'],
@@ -28,7 +27,6 @@ require.config({
         'jquery/validate': 'jquery/jquery.validate',
         'jquery/hover-intent': 'jquery/jquery.hoverIntent',
         'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp',
-        'jquery/jquery.hashchange': 'jquery/jquery.ba-hashchange.min',
         'prototype': 'prototype/prototype-amd',
         'text': 'requirejs/text',
         'domReady': 'requirejs/domReady',

diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
@@ -260,7 +260,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>

diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
@@ -270,7 +270,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>

diff --git a/app/design/frontend/Magento/rush/etc/view.xml b/app/design/frontend/Magento/rush/etc/view.xml
@@ -261,7 +261,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>

diff --git a/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml b/dev/tests/integration/testsuite/Magento/Deploy/_files/zoom1/etc/view.xml
@@ -12,7 +12,6 @@
     <exclude>
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
-        <item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
         <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>

diff --git a/lib/web/jquery/jquery.ba-hashchange.min.js b/lib/web/jquery/jquery.ba-hashchange.min.js
diff --git a/lib/web/legacy-build.min.js b/lib/web/legacy-build.min.js
diff --git a/lib/web/mage/adminhtml/tools.js b/lib/web/mage/adminhtml/tools.js
@@ -89,12 +89,6 @@ function checkByProductPriceType(elem) {
 
 }
 
-Event.observe(window, 'load', function () {
-    if ($('price_default') && $('price_default').checked) {
-        $('price').disabled = 'disabled';
-    }
-});
-
 function toggleSeveralValueElements(checkbox, containers, excludedElements, checked) {
     'use strict';
 

diff --git a/lib/web/mage/popup-window.js b/lib/web/mage/popup-window.js
@@ -57,14 +57,8 @@ define([
             settings.windowURL = settings.windowURL || element.attr('href');
 
             if (settings.centerBrowser) {
-                if ($.browser.msie) { // Hacked together for IE browsers
-                    centeredY = window.screenTop - 120 +
-                        (((document.documentElement.clientHeight + 120) / 2 - settings.height / 2));
-                    centeredX = window.screenLeft + (((document.body.offsetWidth + 20) / 2 - settings.width / 2));
-                } else {
-                    centeredY = window.screenY + ((window.outerHeight / 2 - settings.height / 2));
-                    centeredX = window.screenX + ((window.outerWidth / 2 - settings.width / 2));
-                }
+                centeredY = window.screenY + ((window.outerHeight / 2 - settings.height / 2));
+                centeredX = window.screenX + ((window.outerWidth / 2 - settings.width / 2));
                 windowFeatures += ',left=' + centeredX + ',top=' + centeredY;
             } else if (settings.centerScreen) {
                 centeredY = (screen.height - settings.height) / 2;