From 7fac8a3038b473a5db1d7ec97e7bb8e2552788ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Fri, 6 Sep 2019 10:46:13 +0200
Subject: [PATCH 1/3] Fix #21610 - No loading mask on sitemap, when click on
 Save

---
 .../Controller/Adminhtml/Sitemap/Edit.php     | 21 ++++++++++++-------
 .../Sitemap/view/adminhtml/templates/js.phtml | 12 +++++++++++
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml

diff --git a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
index 14771e7f03a3b..117f73311b644 100644
--- a/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
+++ b/app/code/Magento/Sitemap/Controller/Adminhtml/Sitemap/Edit.php
@@ -6,25 +6,30 @@
 
 namespace Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Block\Template;
+use Magento\Backend\Model\Session;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\Registry;
+use Magento\Sitemap\Controller\Adminhtml\Sitemap;
 
 /**
  * Controller class Edit. Responsible for rendering of a sitemap edit page
  */
-class Edit extends \Magento\Sitemap\Controller\Adminhtml\Sitemap implements HttpGetActionInterface
+class Edit extends Sitemap implements HttpGetActionInterface
 {
     /**
      * Core registry
      *
-     * @var \Magento\Framework\Registry
+     * @var Registry
      */
-    protected $_coreRegistry = null;
+    protected $_coreRegistry;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\Registry $coreRegistry
+     * @param Context $context
+     * @param Registry $coreRegistry
      */
-    public function __construct(\Magento\Backend\App\Action\Context $context, \Magento\Framework\Registry $coreRegistry)
+    public function __construct(Context $context, Registry $coreRegistry)
     {
         $this->_coreRegistry = $coreRegistry;
         parent::__construct($context);
@@ -53,7 +58,7 @@ public function execute()
         }
 
         // 3. Set entered data if was error when we do save
-        $data = $this->_objectManager->get(\Magento\Backend\Model\Session::class)->getFormData(true);
+        $data = $this->_objectManager->get(Session::class)->getFormData(true);
         if (!empty($data)) {
             $model->setData($data);
         }
@@ -67,6 +72,8 @@ public function execute()
             $id ? __('Edit Sitemap') : __('New Sitemap')
         )->_addContent(
             $this->_view->getLayout()->createBlock(\Magento\Sitemap\Block\Adminhtml\Edit::class)
+        )->_addJs(
+            $this->_view->getLayout()->createBlock(Template::class)->setTemplate('Magento_Sitemap::js.phtml')
         );
         $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Site Map'));
         $this->_view->getPage()->getConfig()->getTitle()->prepend(
diff --git a/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml b/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
new file mode 100644
index 0000000000000..4e42a7f7b779a
--- /dev/null
+++ b/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
@@ -0,0 +1,12 @@
+<script>
+    require(
+        ['jquery'],
+        function ($) {
+            $(document).on('save', 'form#edit_form', function () {
+                if ($(this).valid()) {
+                    $('body').trigger('processStart');
+                }
+            });
+        }
+    )
+</script>

From 3f87c97ac9ba14fb93656150db22a0609b743bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Szubert?= <bartlomiejszubert@gmail.com>
Date: Fri, 6 Sep 2019 22:13:35 +0200
Subject: [PATCH 2/3] Fix #21610 - replace inline js with x-magento-init

---
 .../Sitemap/view/adminhtml/templates/js.phtml | 15 +++++----------
 .../adminhtml/web/js/form-submit-loader.js    | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 app/code/Magento/Sitemap/view/adminhtml/web/js/form-submit-loader.js

diff --git a/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml b/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
index 4e42a7f7b779a..480615cba67de 100644
--- a/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
+++ b/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
@@ -1,12 +1,7 @@
-<script>
-    require(
-        ['jquery'],
-        function ($) {
-            $(document).on('save', 'form#edit_form', function () {
-                if ($(this).valid()) {
-                    $('body').trigger('processStart');
-                }
-            });
+<script type="text/x-magento-init">
+    {
+        "#edit_form": {
+            "Magento_Sitemap/js/form-submit-loader" : {}
         }
-    )
+    }
 </script>
diff --git a/app/code/Magento/Sitemap/view/adminhtml/web/js/form-submit-loader.js b/app/code/Magento/Sitemap/view/adminhtml/web/js/form-submit-loader.js
new file mode 100644
index 0000000000000..6b7ba6be65b22
--- /dev/null
+++ b/app/code/Magento/Sitemap/view/adminhtml/web/js/form-submit-loader.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (data, element) {
+
+        $(element).on('save', function () {
+            if ($(this).valid()) {
+                $('body').trigger('processStart');
+            }
+        });
+    };
+});

From f940ae4b013a16a028092d6541bc84915854d91c Mon Sep 17 00:00:00 2001
From: Pavel Bystritsky <51681487+engcom-Foxtrot@users.noreply.github.com>
Date: Tue, 10 Sep 2019 14:37:38 +0300
Subject: [PATCH 3/3] magento/magento2#24482: Static test fix.

---
 app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml b/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
index 480615cba67de..4e7ed34ed4a7e 100644
--- a/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
+++ b/app/code/Magento/Sitemap/view/adminhtml/templates/js.phtml
@@ -1,3 +1,10 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+?>
+
 <script type="text/x-magento-init">
     {
         "#edit_form": {