Ensure to only abort the loading request for a popover when closing it (

#21887)
matomo-org · Feb 8, 2024 · b2da9d0 · b2da9d0
1 parent e8be0cf
commit b2da9d0
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/plugins/CoreHome/javascripts/popover.js b/plugins/CoreHome/javascripts/popover.js
@@ -12,6 +12,7 @@ var Piwik_Popover = (function () {
     var closeCallback = false;
     var isProgrammaticClose = false;
     var scrollTopPosition = 0;
+    var ajaxLoadingRequest = null;
 
     var createContainer = function () {
         if (container === false) {
@@ -63,7 +64,11 @@ var Piwik_Popover = (function () {
                 container.find('div.jqplot-target').trigger('piwikDestroyPlot');
                 container[0].innerHTML = '';
                 container.dialog('destroy').remove();
-                globalAjaxQueue.abort();
+
+                if (ajaxLoadingRequest) {
+                    ajaxLoadingRequest.abort();
+                }
+
                 $('.ui-widget-overlay').off('click.popover');
                 isOpen = false;
                 require('piwik/UI').UIControl.cleanupUnusedControls();
@@ -310,6 +315,8 @@ var Piwik_Popover = (function () {
             ajaxRequest.setCallback(callback);
             ajaxRequest.setFormat('html');
             ajaxRequest.send();
+
+            ajaxLoadingRequest = ajaxRequest;
         },
 
         isOpen: function() {