Merge pull request #154 from wp-slimstat/fix/153-refresh-button-timer

ParhamTehrani · web-flow · commit fe5fdb01cd65 · 2026-03-09T20:53:37.000+03:30
Fix refresh button not resetting countdown timer (#153)
diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js
@@ -1383,6 +1383,7 @@ jQuery(function () {
 // ----- BEGIN: SLIMSTATADMIN HELPER FUNCTIONS ---------------------------------------
 var SlimStatAdmin = {
     refresh_handle: null,
+    _lastManualRefreshTime: 0,
 
     refresh_report: function (id) {
         return function () {
@@ -1393,7 +1394,7 @@ var SlimStatAdmin = {
 
             // Clear the autorefresh timer, if set
             if (SlimStatAdmin.refresh_handle != null) {
-                clearTimeout(SlimStatAdmin.refresh_handle);
+                clearInterval(SlimStatAdmin.refresh_handle);
             }
 
             data = {
@@ -1446,7 +1447,7 @@ var SlimStatAdmin = {
                         });
 
                         if (id == "slim_p7_02") {
-                            SlimStatAdmin._refresh_timer = SlimStatAdminParams.refresh_interval;
+                            SlimStatAdmin._lastManualRefreshTime = Date.now();
                         }
                     }
                 })
@@ -1466,6 +1467,15 @@ var SlimStatAdmin = {
             var currentSeconds = now.getSeconds();
             var currentMinute = now.getMinutes();
 
+            // Check if a manual refresh happened recently (within 2 seconds)
+            var timeSinceManualRefresh = Date.now() - SlimStatAdmin._lastManualRefreshTime;
+            if (timeSinceManualRefresh < 2000) {
+                jQuery(".refresh-timer").html("0:00");
+                // Reset the trigger minute to sync with the wall clock after manual refresh
+                lastTriggerMinute = -1;
+                return;
+            }
+
             // Trigger pulse at exactly :00 of a new minute
             if (currentSeconds === 0 && lastTriggerMinute !== currentMinute) {
                 lastTriggerMinute = currentMinute;
