From 00bfbd0e8f556fa0e916fc4757c767741093c2ab Mon Sep 17 00:00:00 2001
From: vgelani <vishalgelani99@gmail.com>
Date: Sat, 19 May 2018 13:23:33 +0530
Subject: [PATCH 1/4] Refactor validate code in Tax module

---
 .../adminhtml/templates/class/page/edit.phtml     |  7 +++++++
 .../Tax/view/adminhtml/web/js/page/validate.js    | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
index 8930a4de28fe5..d039747219621 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
@@ -18,3 +18,10 @@ require(['jquery', "mage/mage"], function(jQuery){
 
 });
 </script>
+<script type="text/x-magento-init">
+    {
+        "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {
+            "Magento_Tax/js/page/validate": {}
+        }
+    }
+</script>
diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
new file mode 100644
index 0000000000000..797dfdfdb9dfe
--- /dev/null
+++ b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'mage/mage'
+], function(jQuery){
+    'use strict';
+
+    return function (data, element) {
+        jQuery(element).mage('form').mage('validation');
+    }
+});
\ No newline at end of file

From cdc5b2ffbc4540f86a0054cc41d650b9a3cf2ec8 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Sat, 19 May 2018 20:49:01 +0530
Subject: [PATCH 2/4] Fixed semicolon issue

---
 app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
index 797dfdfdb9dfe..50afc80689477 100644
--- a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
+++ b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
@@ -11,5 +11,5 @@ define([
 
     return function (data, element) {
         jQuery(element).mage('form').mage('validation');
-    }
-});
\ No newline at end of file
+    };
+});

From f8d5312c4903ebcf34059a5531723df55ffff3d0 Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
Date: Sun, 20 May 2018 20:15:18 +0530
Subject: [PATCH 3/4] Fixed coding standard issue

---
 app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
index 50afc80689477..a49f199ba56b6 100644
--- a/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
+++ b/app/code/Magento/Tax/view/adminhtml/web/js/page/validate.js
@@ -6,7 +6,7 @@
 define([
     'jquery',
     'mage/mage'
-], function(jQuery){
+], function (jQuery) {
     'use strict';
 
     return function (data, element) {

From 2ecf8c67bdd81dcd15874b73d72cb4ef9b14ecfd Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <strpwebstudio@gmail.com>
Date: Tue, 22 May 2018 15:40:15 +0300
Subject: [PATCH 4/4] Format the javascript code in Tax module #15343

- Remove old realization
---
 .../Tax/view/adminhtml/templates/class/page/edit.phtml     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
index d039747219621..18e86549a1ff9 100644
--- a/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
+++ b/app/code/Magento/Tax/view/adminhtml/templates/class/page/edit.phtml
@@ -11,13 +11,6 @@
     <?= $block->getSaveButtonHtml() ?>
 </div>
 <?= $block->getRenameFormHtml() ?>
-<script>
-require(['jquery', "mage/mage"], function(jQuery){
-
-    jQuery('#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>').mage('form').mage('validation');
-
-});
-</script>
 <script type="text/x-magento-init">
     {
         "#<?= /* @escapeNotVerified */ $block->getRenameFormId() ?>": {