From f30bf4fa7860b6521a9ffb94b59b11e9b24851dc Mon Sep 17 00:00:00 2001
From: Peter Zhang <peter@innocraft.com>
Date: Mon, 25 Jul 2022 20:50:28 +1200
Subject: revert refresh button (#19522)

* revert refresh bottom

revert refresh bottom

* update screenshots

* Update Transitions_transitions_popup_urls.png

update ui

* add refresh short cut

add refresh short cut

* Update plugins/CoreHome/javascripts/top_controls.js

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* update screenshots and add translation

update screenshots and add translation

* Update plugins/CoreHome/CoreHome.php

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Revert "Update Transitions_transitions_popup_urls.png"

This reverts commit b1420422717ef761180318bea91eab39d3aa4b86.

* Update UIIntegrationTest_shortcuts.png

update shortcut screenshot and revert Transition screenshots

Co-authored-by: Stefan Giehl <stefan@matomo.org>
---
 plugins/CoreHome/javascripts/refresh-button.js | 43 --------------------------
 plugins/CoreHome/javascripts/top_controls.js   | 19 ++++++++++++
 2 files changed, 19 insertions(+), 43 deletions(-)
 delete mode 100644 plugins/CoreHome/javascripts/refresh-button.js

(limited to 'plugins/CoreHome/javascripts')

diff --git a/plugins/CoreHome/javascripts/refresh-button.js b/plugins/CoreHome/javascripts/refresh-button.js
deleted file mode 100644
index de364d2a3e..0000000000
--- a/plugins/CoreHome/javascripts/refresh-button.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link http://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-$(function () {
-  var iconRefresh = $('.top_controls .icon-reload');
-
-  function refresh() {
-    var Matomo = window.CoreHome.Matomo;
-    var hashParsed = window.CoreHome.MatomoUrl.hashParsed.value;
-
-    Matomo.postEvent('loadPage', hashParsed.category, hashParsed.subcategory);
-  }
-
-  function isCoreHomeModuleActive() {
-    var search = window.CoreHome.MatomoUrl.parse(window.location.search.slice(1));
-    return search.module === 'CoreHome';
-  }
-
-  if (isCoreHomeModuleActive()) {
-    iconRefresh.removeClass('hidden');
-
-    iconRefresh.on('click', function (e) {
-      e.preventDefault();
-      refresh();
-    });
-
-    piwikHelper.registerShortcut('r', _pk_translate('CoreHome_ShortcutRefresh'), function (event) {
-      if (event.altKey) {
-        return;
-      }
-      if (event.preventDefault) {
-        event.preventDefault();
-      } else {
-        event.returnValue = false; // IE
-      }
-
-      refresh();
-    });
-  }
-});
diff --git a/plugins/CoreHome/javascripts/top_controls.js b/plugins/CoreHome/javascripts/top_controls.js
index f4a793b4b5..66dee03260 100644
--- a/plugins/CoreHome/javascripts/top_controls.js
+++ b/plugins/CoreHome/javascripts/top_controls.js
@@ -108,3 +108,22 @@ function blockPropegation(){
         e.stopPropagation();
     })
 }
+
+//refresh page short cut 'r'
+$(function () {
+  piwikHelper.registerShortcut('r', _pk_translate('CoreHome_ShortcutRefresh'), function (event) {
+    if (event.altKey) {
+      return;
+    }
+    if (event.preventDefault) {
+      event.preventDefault();
+    } else {
+      event.returnValue = false; // IE
+    }
+
+    var Matomo = window.CoreHome.Matomo;
+    var hashParsed = window.CoreHome.MatomoUrl.hashParsed.value;
+
+    Matomo.postEvent('loadPage', hashParsed.category, hashParsed.subcategory);
+  });
+});
\ No newline at end of file
-- 
cgit v1.2.3