From 1623a22e1d774de8b388a04abc168d8b3f1c2dc8 Mon Sep 17 00:00:00 2001 From: Paul Briscoe Date: Sun, 22 Oct 2017 23:54:41 -0400 Subject: [PATCH 1/3] MAGETWO-81311: Check the length of the array before attempting to slice it. Slicing an array of one will create an empty result. Issue: 9944 --- app/code/Magento/Ui/view/base/web/js/form/element/abstract.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js index 6bbcb4416d33a..11f1f4c04fadc 100755 --- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js @@ -119,7 +119,7 @@ define([ this._super(); scope = this.dataScope; - name = scope.split('.').slice(1); + name = (scope.split('.').length > 1) ? scope.split('.').slice(1) : scope.split('.'); valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate; From 1951f07d8ce53b9330fff70246500a059764ab05 Mon Sep 17 00:00:00 2001 From: Paul Briscoe Date: Mon, 23 Oct 2017 00:54:27 -0400 Subject: [PATCH 2/3] MAGETWO-81311: Fix error 'gratuitous parens' from CI build. Issue: 9944 --- app/code/Magento/Ui/view/base/web/js/form/element/abstract.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js index 11f1f4c04fadc..55e6d6cc1c57f 100755 --- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js @@ -119,7 +119,7 @@ define([ this._super(); scope = this.dataScope; - name = (scope.split('.').length > 1) ? scope.split('.').slice(1) : scope.split('.'); + name = scope.split('.').length > 1 ? scope.split('.').slice(1) : scope.split('.'); valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate; From 08c61ac5ac124cbf0a8c0cf971555dbd5f263ae6 Mon Sep 17 00:00:00 2001 From: Paul Briscoe Date: Mon, 23 Oct 2017 09:24:20 -0400 Subject: [PATCH 3/3] MAGETWO-81311: Refactor split onto previous line per comment feedback. scope variable is not used anywhere else except on the next line. Issue: 9944 --- app/code/Magento/Ui/view/base/web/js/form/element/abstract.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js index 55e6d6cc1c57f..b6979121a1891 100755 --- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js @@ -118,8 +118,8 @@ define([ this._super(); - scope = this.dataScope; - name = scope.split('.').length > 1 ? scope.split('.').slice(1) : scope.split('.'); + scope = this.dataScope.split('.'); + name = scope.length > 1 ? scope.slice(1) : scope; valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate;