From d29fdd2ee4fb8445b9fa28963e2ca8c189739d30 Mon Sep 17 00:00:00 2001
From: Nimesh Patel <patelnimesh1988@gmail.com>
Date: Fri, 18 May 2018 13:25:11 +0530
Subject: [PATCH 1/2] Refactor javscript for customer logout

---
 .../view/frontend/templates/logout.phtml        | 17 ++++++++---------
 .../view/frontend/web/js/logout-redirect.js     | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js

diff --git a/app/code/Magento/Customer/view/frontend/templates/logout.phtml b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
index 43665045ce3e2..5a99b7d931b9b 100644
--- a/app/code/Magento/Customer/view/frontend/templates/logout.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/logout.phtml
@@ -7,13 +7,12 @@
 /** @var \Magento\Framework\View\Element\Template $block */
 ?>
 <p><?= $block->escapeHtml(__('You have signed out and will go to our homepage in 5 seconds.')) ?></p>
-<script>
-require([
-    "jquery",
-    "mage/mage"
-], function($){
-
-    $($.mage.redirect("<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>", "assign", 5000));
-
-});
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Customer/js/logout-redirect": {
+                "url": "<?= $block->escapeJs($block->escapeUrl($block->getUrl())) ?>"
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
new file mode 100644
index 0000000000000..c8d06e51fc39e
--- /dev/null
+++ b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    "jquery",
+    "mage/mage"
+], function ($) {
+    'use strict';
+
+    return function (data) {
+        $($.mage.redirect(data.url, "assign", 5000));
+    };
+});

From 732832d9774681c055c27ffaeb7023c169c51228 Mon Sep 17 00:00:00 2001
From: Nimesh Patel <patelnimesh1988@gmail.com>
Date: Fri, 18 May 2018 16:41:59 +0530
Subject: [PATCH 2/2] Fixed Invalid quote mark issue

---
 .../Customer/view/frontend/web/js/logout-redirect.js        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
index c8d06e51fc39e..6792626df6a08 100644
--- a/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
+++ b/app/code/Magento/Customer/view/frontend/web/js/logout-redirect.js
@@ -4,12 +4,12 @@
  */
 
 define([
-    "jquery",
-    "mage/mage"
+    'jquery',
+    'mage/mage'
 ], function ($) {
     'use strict';
 
     return function (data) {
-        $($.mage.redirect(data.url, "assign", 5000));
+        $($.mage.redirect(data.url, 'assign', 5000));
     };
 });