Merge remote-tracking branch 'upstream/2.4-develop' into B2B-2015

Author: joanhe

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryFilterSection.xml

@@ -10,6 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryFilterSection">
         <element name="CategoryFilter" type="button" selector="//main//div[contains(@class,'filter-options')]//div[contains(text(), 'Category')]"/>
-        <element name="CategoryByName" type="button" selector="//main//div[@class='filter-options']//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
+        <element name="CategoryByName" type="button" selector="//main//div[contains(@class,'filter-options')]//li[@class='item']//a[contains(text(), '{{var1}}')]" parameterized="true"/>
     </section>
 </sections>

app/code/Magento/Ui/view/base/web/js/modal/modal.js

@@ -16,7 +16,8 @@ define([
     'Magento_Ui/js/lib/key-codes',
     'jquery-ui-modules/widget',
     'jquery-ui-modules/core',
-    'mage/translate'
+    'mage/translate',
+    'jquery/z-index'
 ], function ($, _, template, popupTpl, slideTpl, customTpl, keyCodes) {
     'use strict';
 
@@ -39,39 +40,7 @@ define([
                 return transitions[transition];
             }
         }
-    })(),
-
-    /**
-     * Implementation of zIndex used from jQuery UI
-     * @param {Element} elem
-     * @private
-     */
-    getZIndex = function (elem) {
-        var position, zIndex;
-
-        /* eslint-disable max-depth */
-        while (elem.length && elem[ 0 ] !== document) {
-            // Ignore z-index if position is set to a value where z-index is ignored by the browser
-            // This makes behavior of this function consistent across browsers
-            // WebKit always returns auto if the element is positioned
-            position = elem.css('position');
-
-            if (position === 'absolute' || position === 'relative' || position === 'fixed') {
-                // IE returns 0 when zIndex is not specified
-                // other browsers return a string
-                // we ignore the case of nested elements with an explicit value of 0
-                zIndex = parseInt(elem.css('zIndex'), 10);
-
-                if (!isNaN(zIndex) && zIndex !== 0) {
-                    return zIndex;
-                }
-            }
-            elem = elem.parent();
-        }
-
-        return 0;
-        /* eslint-enable max-depth */
-    };
+    })();
 
     /**
      * Modal Window Widget
@@ -373,17 +342,18 @@ define([
          * Set z-index and margin for modal and overlay.
          */
         _setActive: function () {
-            var zIndex = getZIndex(this.modal),
+            var zIndex = this.modal.zIndex(),
                 baseIndex = zIndex + this._getVisibleCount();
 
             if (this.modal.data('active')) {
                 return;
             }
+
             this.modal.data('active', true);
 
-            this.overlay.css('z-index', ++baseIndex);
-            this.prevOverlayIndex = baseIndex;
-            this.modal.css('z-index', baseIndex + 1);
+            this.overlay.zIndex(++baseIndex);
+            this.prevOverlayIndex = this.overlay.zIndex();
+            this.modal.zIndex(this.overlay.zIndex() + 1);
 
             if (this._getVisibleSlideCount()) {
                 this.modal.css('marginLeft', this.options.modalLeftMargin * this._getVisibleSlideCount());
@@ -398,7 +368,7 @@ define([
             this.modal.data('active', false);
 
             if (this.overlay) {
-                this.overlay.css('z-index', this.prevOverlayIndex - 1);
+                this.overlay.zIndex(this.prevOverlayIndex - 1);
             }
         },
 

dev/tests/unit/phpunit.xml.dist

@@ -28,6 +28,10 @@
         <testsuite name="Magento_Unit_Tests_App_Code">
             <directory>../../../app/code/*/*/Test/Unit</directory>
             <directory>../../../vendor/magento/module-*/Test/Unit</directory>
+            <exclude>../../../app/code/Magento/Indexer/Test/Unit</exclude>
+        </testsuite>
+        <testsuite name="Magento_Unit_Tests_App_Code_Indexer">
+            <directory>../../../app/code/Magento/Indexer/Test/Unit</directory>
         </testsuite>
         <testsuite name="Magento_Unit_Tests_Other">
             <directory>../../../lib/internal/*/*/Test/Unit</directory>

lib/web/jquery/z-index.js

@@ -0,0 +1,46 @@
+/*!
+ * zIndex plugin from jQuery UI Core - v1.10.4
+ * http://jqueryui.com
+ *
+ * Copyright 2014 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/category/ui-core/
+ */
+define([
+    'jquery'
+], function ($, undefined) {
+
+// plugins
+    $.fn.extend({
+        zIndex: function (zIndex) {
+            if (zIndex !== undefined) {
+                return this.css("zIndex", zIndex);
+            }
+
+            if (this.length) {
+                var elem = $(this[0]), position, value;
+                while (elem.length && elem[0] !== document) {
+                    // Ignore z-index if position is set to a value where z-index is ignored by the browser
+                    // This makes behavior of this function consistent across browsers
+                    // WebKit always returns auto if the element is positioned
+                    position = elem.css("position");
+                    if (position === "absolute" || position === "relative" || position === "fixed") {
+                        // IE returns 0 when zIndex is not specified
+                        // other browsers return a string
+                        // we ignore the case of nested elements with an explicit value of 0
+                        // <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+                        value = parseInt(elem.css("zIndex"), 10);
+                        if (!isNaN(value) && value !== 0) {
+                            return value;
+                        }
+                    }
+                    elem = elem.parent();
+                }
+            }
+
+            return 0;
+        }
+    });
+});