merge magento/2.2-develop into magento-pangolin/2.2-MQE-975

Author: Magento CICD

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

@@ -206,13 +206,17 @@ define([
 
             switch (keyCode) {
                 case $.ui.keyCode.HOME:
-                    this._getFirstVisibleElement().addClass(this.options.selectClass);
-                    this.responseList.selected = this._getFirstVisibleElement();
+                    if (this._getFirstVisibleElement()) {
+                        this._getFirstVisibleElement().addClass(this.options.selectClass);
+                        this.responseList.selected = this._getFirstVisibleElement();
+                    }
                     break;
 
                 case $.ui.keyCode.END:
-                    this._getLastElement().addClass(this.options.selectClass);
-                    this.responseList.selected = this._getLastElement();
+                    if (this._getLastElement()) {
+                        this._getLastElement().addClass(this.options.selectClass);
+                        this.responseList.selected = this._getLastElement();
+                    }
                     break;
 
                 case $.ui.keyCode.ESCAPE:

app/code/Magento/Sitemap/Model/Sitemap.php

@@ -614,7 +614,7 @@ protected function _finalizeSitemap($type = self::TYPE_URL)
      */
     protected function _getCurrentSitemapFilename($index)
     {
-        return self::INDEX_FILE_PREFIX . '-' . $this->getStoreId() . '-' . $index . '.xml';
+        return str_replace('.xml', '', $this->getSitemapFilename()) . '-' . $this->getStoreId() . '-' . $index . '.xml';
     }
 
     /**

app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

@@ -143,6 +143,7 @@ define([
                         element.hide();
                         this.totalItems--;
                         this.updateItemsCountField();
+                        this.updateSortOrder();
                     }
                 },
 
@@ -153,6 +154,17 @@ define([
                     $('swatch-visual-option-count-check').value = this.totalItems > 0 ? '1' : '';
                 },
 
+                /**
+                 * Update sort order values
+                 */
+                updateSortOrder: function () {
+                    jQuery('[data-role=swatch-visual-options-container] tr:not(.no-display) [data-role=order]').each(
+                        function (index, element) {
+                            jQuery(element).val(index + 1);
+                        }
+                    );
+                },
+
                 /**
                  * Enable delete button for new option
                  *
@@ -267,11 +279,7 @@ define([
                      * Update component
                      */
                     update: function () {
-                        $('[data-role=swatch-visual-options-container] [data-role=order]').each(
-                            function (index, element) {
-                                $(element).val(index + 1);
-                            }
-                        );
+                        swatchVisualOption.updateSortOrder();
                     }
                 });
             });

app/code/Magento/Tax/view/frontend/web/js/view/checkout/summary/tax.js

@@ -67,7 +67,7 @@ define([
                 }
             }
 
-            return amount;
+            return parseFloat(amount);
         },
 
         /**

lib/web/mage/utils/misc.js

@@ -271,7 +271,7 @@ define([
         convertToMomentFormat: function (format) {
             var newFormat;
 
-            newFormat = format.replace(/yy|y/gi, 'YYYY'); // replace the year
+            newFormat = format.replace(/yyyy|yy|y/, 'YYYY'); // replace the year
             newFormat = newFormat.replace(/dd|d/g, 'DD'); // replace the date
 
             return newFormat;