From da9afe669e96f9aca6d4e39283a8a005165e1825 Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 19 Oct 2017 11:38:39 -0400 Subject: [PATCH 1/7] MAGETWO-81310: Fixed ability to set field config from layout xml #11302 --- .../Block/Checkout/AttributeMerger.php | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php index 5ce0544097a26..54e52741bc0a4 100644 --- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php +++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php @@ -164,20 +164,19 @@ protected function getFieldConfig( $element = [ 'component' => isset($additionalConfig['component']) ? $additionalConfig['component'] : $uiComponent, - 'config' => [ - // customScope is used to group elements within a single form (e.g. they can be validated separately) - 'customScope' => $dataScopePrefix, - 'customEntry' => isset($additionalConfig['config']['customEntry']) - ? $additionalConfig['config']['customEntry'] - : null, - 'template' => 'ui/form/field', - 'elementTmpl' => isset($additionalConfig['config']['elementTmpl']) - ? $additionalConfig['config']['elementTmpl'] - : $elementTemplate, - 'tooltip' => isset($additionalConfig['config']['tooltip']) - ? $additionalConfig['config']['tooltip'] - : null - ], + 'config' => $this->mergeConfigurationNode( + 'config', + $additionalConfig, + [ + 'config' => [ + // customScope is used to group elements within a single + // form (e.g. they can be validated separately) + 'customScope' => $dataScopePrefix, + 'template' => 'ui/form/field', + 'elementTmpl' => $elementTemplate, + ], + ] + ), 'dataScope' => $dataScopePrefix . '.' . $attributeCode, 'label' => $attributeConfig['label'], 'provider' => $providerName, From 6702cdce13957b10dbf29a4a00e17eba6f97c982 Mon Sep 17 00:00:00 2001 From: Cristian Sanclemente Date: Thu, 19 Oct 2017 15:49:16 +0200 Subject: [PATCH 2/7] get language code --- lib/internal/Magento/Framework/View/Page/Config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php index aafb5eda9b617..529f8b02e0635 100644 --- a/lib/internal/Magento/Framework/View/Page/Config.php +++ b/lib/internal/Magento/Framework/View/Page/Config.php @@ -174,7 +174,7 @@ public function __construct( $this->setElementAttribute( self::ELEMENT_TYPE_HTML, self::HTML_ATTRIBUTE_LANG, - str_replace('_', '-', $this->localeResolver->getLocale()) + strstr($this->localeResolver->getLocale(), '_', true) ); } From 50f4051c1a38dd1eba1e2a210e68e6771534ba82 Mon Sep 17 00:00:00 2001 From: Prince Patel Date: Sat, 28 Jul 2018 01:20:39 +0530 Subject: [PATCH 3/7] Update rules.js --- app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js index 8104d4883dce6..00de03ba69647 100644 --- a/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js +++ b/app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js @@ -316,7 +316,7 @@ define([ ], "pattern": [ function(value, param) { - return param.test(value); + return new RegExp(param).test(value); }, $.mage.__('Invalid format.') ], From b50caeb31de1c71a44d4a52af980494126246575 Mon Sep 17 00:00:00 2001 From: Alexander Kras'ko <0m3r.mail@gmail.com> Date: Wed, 27 Jun 2018 16:56:34 +0300 Subject: [PATCH 4/7] Update sidebar.js --- app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index b529e869a1a5a..86db8763677b5 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -77,8 +77,12 @@ define([ confirm: function () { self._removeItem($(event.currentTarget)); }, - always: function (event) { - event.stopImmediatePropagation(); + + /** @inheritdoc */ + always: function (e) { + if (e && typeof e.stopImmediatePropagation === 'function') { + e.stopImmediatePropagation(); + } } } }); From 540cdb5e13097fbf3ffd5edd7a23beb8d88e12f2 Mon Sep 17 00:00:00 2001 From: Alexander Kras'ko Date: Mon, 2 Jul 2018 10:02:03 +0300 Subject: [PATCH 5/7] Fix for #14593 (duo over) --- app/code/Magento/Ui/view/base/web/js/modal/modal.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js index b2ce644afce45..05a8f68f845d4 100644 --- a/app/code/Magento/Ui/view/base/web/js/modal/modal.js +++ b/app/code/Magento/Ui/view/base/web/js/modal/modal.js @@ -100,11 +100,12 @@ define([ /** * Escape key press handler, * close modal window + * @param {Object} event - event */ - escapeKey: function () { + escapeKey: function (event) { if (this.options.isOpen && this.modal.find(document.activeElement).length || this.options.isOpen && this.modal[0] === document.activeElement) { - this.closeModal(); + this.closeModal(event); } } } From d937ca701cd217d959b43f009e192c69cd90a595 Mon Sep 17 00:00:00 2001 From: Alexander Kras'ko Date: Mon, 2 Jul 2018 10:10:04 +0300 Subject: [PATCH 6/7] Restore sidebar.js --- app/code/Magento/Checkout/view/frontend/web/js/sidebar.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js index 86db8763677b5..d9a4ef7989c24 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/sidebar.js @@ -80,9 +80,7 @@ define([ /** @inheritdoc */ always: function (e) { - if (e && typeof e.stopImmediatePropagation === 'function') { - e.stopImmediatePropagation(); - } + e.stopImmediatePropagation(); } } }); From b957e32368fc27b804b4bcc3dc2c283d0aeb14b5 Mon Sep 17 00:00:00 2001 From: tejash Date: Fri, 20 Jul 2018 14:30:31 +0530 Subject: [PATCH 7/7] Mobile device style groups incorrect order --- lib/web/css/source/lib/_responsive.less | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/web/css/source/lib/_responsive.less b/lib/web/css/source/lib/_responsive.less index d1bbbae7f6875..efb706f85eac0 100644 --- a/lib/web/css/source/lib/_responsive.less +++ b/lib/web/css/source/lib/_responsive.less @@ -27,24 +27,24 @@ & when (@media-target = 'mobile'), (@media-target = 'all') { - @media only screen and (max-width: (@screen__xxs - 1)) { - .media-width('max', @screen__xxs); + @media only screen and (max-width: @screen__m) { + .media-width('max', (@screen__m + 1)); } - @media only screen and (max-width: (@screen__xs - 1)) { - .media-width('max', @screen__xs); + @media only screen and (max-width: (@screen__m - 1)) { + .media-width('max', @screen__m); } @media only screen and (max-width: (@screen__s - 1)) { .media-width('max', @screen__s); } - @media only screen and (max-width: (@screen__m - 1)) { - .media-width('max', @screen__m); + @media only screen and (max-width: (@screen__xs - 1)) { + .media-width('max', @screen__xs); } - @media only screen and (max-width: @screen__m) { - .media-width('max', (@screen__m + 1)); + @media only screen and (max-width: (@screen__xxs - 1)) { + .media-width('max', @screen__xxs); } @media all and (min-width: @screen__s) {