🔃 [EngCom] Public Pull Requests - 2.1-develop

Accepted Public Pull Requests:
 - magento/magento2#15725: [Backport] Updated font-size variable and standardize #ToDo UI (by @vgelani)
 - magento/magento2#15724: [Backport] Moved css from media #TODO (by @vgelani)
 - magento/magento2#15736: [Backwardport] Refactor javascript code of  button split widget (by @vijay-wagento)
 - magento/magento2#15739: [Backport] fix: support multiple minisearch widget instances (by @vijay-wagento)
 - magento/magento2#15719: [Backport 2.1] Fixed return type of wishlist's getImageData in DocBlock (by @rogyar)
 - magento/magento2#15716: [BACKPORT 2.1 #15695] Fixed a couple of typos (by @dverkade)
 - magento/magento2#15803: [Backport] Remove double semicolon from the style sheets. (by @vijay-wagento)
 - magento/magento2#15807: [Backport] [Code improvement] (by @hitesh-wagento)
 - magento/magento2#15810: [Backport] fix: support multiple minisearch widget instances (by @DanielRuf)
 - magento/magento2#15805: [Backport] Make necessary space. #5 (by @chirag-wagento)


Fixed GitHub Issues:
 - magento/magento2#15354: Refactor javascript code of button split widget call js component (reported by @amittiwari024) has been fixed in magento/magento2#15736 by @vijay-wagento in 2.1-develop branch
   Related commits:
     1. 02453f6

Author: magento-engcom-team

app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml

@@ -41,11 +41,11 @@
     <?php endif; ?>
 </div>
 
-<script>
-require(['jquery'], function($){
-        $('.actions-split')
-            .on('click.splitDefault', '.action-default', function() {
-                $(this).siblings('.dropdown-menu').find('.item-default').trigger('click');
-            });
-});
+<script type="text/x-magento-init">
+    {
+        ".actions-split": {
+            "Magento_Ui/js/grid/controls/button/split": {}
+        }
+    }
 </script>
+

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/AbstractSidebar.php

@@ -69,7 +69,7 @@ public function canDisplay()
     }
 
     /**
-     * Retrieve disply item qty availablity
+     * Retrieve display item qty availability
      *
      * @return false
      */

app/code/Magento/Search/view/frontend/web/form-mini.js

@@ -51,7 +51,7 @@ define([
             this.autoComplete = $(this.options.destinationSelector);
             this.searchForm = $(this.options.formSelector);
             this.submitBtn = this.searchForm.find(this.options.submitBtn)[0];
-            this.searchLabel = $(this.options.searchLabel);
+            this.searchLabel = this.searchForm.find(this.options.searchLabel);
             this.isExpandable = this.options.isExpandable;
 
             _.bindAll(this, '_onKeyDown', '_onPropertyChange', '_onSubmit');

app/code/Magento/Ui/view/base/web/js/form/components/fieldset.js

@@ -109,14 +109,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }

app/code/Magento/Ui/view/base/web/js/form/components/group.js

@@ -54,14 +54,14 @@ define([
          * @returns {Group} Chainable.
          */
         _setClasses: function () {
-            var addtional = this.additionalClasses,
+            var additional = this.additionalClasses,
                 classes;
 
-            if (_.isString(addtional)) {
-                addtional = this.additionalClasses.split(' ');
+            if (_.isString(additional)) {
+                additional = this.additionalClasses.split(' ');
                 classes = this.additionalClasses = {};
 
-                addtional.forEach(function (name) {
+                additional.forEach(function (name) {
                     classes[name] = true;
                 }, this);
             }

app/code/Magento/Wishlist/CustomerData/Wishlist.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright © 2013-2018 Magento, Inc. All rights reserved.
+ * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Wishlist\CustomerData;
@@ -142,7 +142,7 @@ protected function getItemData(\Magento\Wishlist\Model\Item $wishlistItem)
      * Retrieve product image data
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return \Magento\Catalog\Block\Product\Image
+     * @return array
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function getImageData($product)

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/lib/_buttons.less

@@ -99,8 +99,8 @@
     background-color: transparent;
     border: none;
     color: @link__color;
-    font-family: @btn__base__font-size;
-    font-size: 1.5rem; // ToDo UI: Check font-size and standardize
+    font-family: @font-family__base;
+    font-size: @base__font-size;
 
     &:hover,
     &:active,

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less

@@ -25,6 +25,7 @@
 //  _____________________________________________
 
 & when (@media-common = true) {
+
     //  Product Lists
     .products {
         margin: @indent__l 0;

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less

@@ -296,6 +296,7 @@
             }
         }
     }
+
     .opc-wrapper {
         .form-login,
         .form-shipping-address {
@@ -307,6 +308,7 @@
             padding-bottom: @indent__base;
         }
     }
+
     .table-checkout-shipping-method {
         width: auto;
     }
@@ -346,6 +348,7 @@
             }
         }
     }
+
     .table-checkout-shipping-method {
         min-width: 500px;
     }

app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

@@ -62,17 +62,16 @@
 //  Common
 //  _____________________________________________
 
-& when (@media-common = true) {
-    body {
+.page-wrapper {
+    .ie9 & {
         .lib-css(background-color, @page__background-color);
+        min-height: 0;
     }
+}
 
-    //  ToDo UI: move it directly to .page-wrapper (now it doesn't appear in mediaquery cuz of size of css)
-    .page-wrapper {
-        .ie9 & {
-            .lib-css(background-color, @page__background-color);
-            min-height: 0;
-        }
+& when (@media-common = true) {
+    body {
+        .lib-css(background-color, @page__background-color);
     }
 
     //

dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css

@@ -13,7 +13,7 @@
     overflow: hidden;
     padding: 5px 6px 3px;
     margin-left: 12px;
-    color: #7a7976;;
+    color: #7a7976;
 }
 
 [class^=" catalog-product-"] .page-actions .action-back:hover,

dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php

@@ -100,6 +100,14 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
      */
     private function validatePropertiesSorting(PHP_CodeSniffer_File $phpcsFile, $stackPtr, array $properties)
     {
+        // Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.
+        $symbolsForSkip = ['(', 'block'];
+        $properties = array_filter(
+            $properties,
+            function ($var) use ($symbolsForSkip) {
+                return !in_array($var, $symbolsForSkip);
+            }
+        );
 
         $originalProperties = $properties;
         sort($properties);

lib/web/extjs/resources/css/ytheme-magento.css

@@ -15,7 +15,7 @@
     background:url(../images/magento/loading_bg.gif) no-repeat #eae2ca;
     padding:85px 15px 15px 15px;
     font-size:14px;
-        font-weight:bold;;
+        font-weight:bold;
     color:#611B06;
     width:206px;
     text-align:center;