From 85a47d91cc15968bdef25b10ec2e5597e1d5d4fa Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Mon, 14 May 2018 11:25:13 +0200 Subject: [PATCH 1/6] Move buttons definition to separate file --- .../Magento/Ui/view/base/web/js/form/adapter.js | 10 +++------- .../Ui/view/base/web/js/form/adapter/buttons.js | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index 0be9af06f9579..b623ce11603dd 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -9,15 +9,11 @@ define([ 'jquery', 'underscore' -], function ($, _) { + './adapter/buttons' +], function ($, _, buttons) { 'use strict'; - var buttons = { - 'reset': '#reset', - 'save': '#save', - 'saveAndContinue': '#save_and_continue' - }, - selectorPrefix = '', + var selectorPrefix = '', eventPrefix; /** diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js new file mode 100644 index 0000000000000..f1138608f3233 --- /dev/null +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js @@ -0,0 +1,15 @@ +/** + * Copyright © Magento, Inc. All rights reserved. + * See COPYING.txt for license details. + */ + +/** + * @api + */ +define(function () { + return { + 'reset': '#reset', + 'save': '#save', + 'saveAndContinue': '#save_and_continue' + } +}); From 0dee82ad253d2129bbeb66fcfe6c6a7348f69114 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Mon, 14 May 2018 16:05:13 +0200 Subject: [PATCH 2/6] Change relative path to absolute path for testability --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index b623ce11603dd..f864026259766 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -9,7 +9,7 @@ define([ 'jquery', 'underscore' - './adapter/buttons' + 'Magento_Ui/js/form/adapter/buttons' ], function ($, _, buttons) { 'use strict'; From baa36da70b5303a48b1b932b47f0562575937ccc Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Mon, 14 May 2018 16:05:47 +0200 Subject: [PATCH 3/6] Add strict mode --- app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js index f1138608f3233..fc43e6cdbb071 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js @@ -7,6 +7,8 @@ * @api */ define(function () { + 'use strict'; + return { 'reset': '#reset', 'save': '#save', From 196ee86f3cf55c6d5ddb975eeddba35c25a1aa01 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Mon, 14 May 2018 18:13:00 +0200 Subject: [PATCH 4/6] Fix missing comma --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index f864026259766..660d3382cb97c 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -8,7 +8,7 @@ */ define([ 'jquery', - 'underscore' + 'underscore', 'Magento_Ui/js/form/adapter/buttons' ], function ($, _, buttons) { 'use strict'; From 130223e0b03c08d317d474f8cac6f46510977090 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Tue, 15 May 2018 07:30:29 +0200 Subject: [PATCH 5/6] Make sure colons are in right place --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index 660d3382cb97c..200aaa487107d 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -13,8 +13,8 @@ define([ ], function ($, _, buttons) { 'use strict'; - var selectorPrefix = '', - eventPrefix; + var selectorPrefix = ''; + var eventPrefix; /** * Initialize listener. From 99ee323773821d91e5b53d6e2b1fc0571d66a805 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Tue, 15 May 2018 16:06:52 +0200 Subject: [PATCH 6/6] Fix missing column because of eslint --- app/code/Magento/Ui/view/base/web/js/form/adapter.js | 4 ++-- app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter.js b/app/code/Magento/Ui/view/base/web/js/form/adapter.js index 200aaa487107d..660d3382cb97c 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter.js @@ -13,8 +13,8 @@ define([ ], function ($, _, buttons) { 'use strict'; - var selectorPrefix = ''; - var eventPrefix; + var selectorPrefix = '', + eventPrefix; /** * Initialize listener. diff --git a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js index fc43e6cdbb071..2b939e25da479 100644 --- a/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js +++ b/app/code/Magento/Ui/view/base/web/js/form/adapter/buttons.js @@ -13,5 +13,5 @@ define(function () { 'reset': '#reset', 'save': '#save', 'saveAndContinue': '#save_and_continue' - } + }; });