Fix popover stack behaviour (#15444)

1 files changed, 3 insertions, 6 deletions

diff --git a/plugins/CoreHome/javascripts/popover.js b/plugins/CoreHome/javascripts/popover.js
index 19590d5b86..989de673a1 100644
--- a/plugins/CoreHome/javascripts/popover.js
+++ b/plugins/CoreHome/javascripts/popover.js
@@ -35,6 +35,8 @@ var Piwik_Popover = (function () {
                 }
 
                 $('.ui-widget-overlay').on('click.popover', function () {
+                    // if clicking outside of the dialog, close entire stack
+                    broadcast.resetPopoverStack();
                     container.dialog('close');
                 });
 
@@ -47,11 +49,6 @@ var Piwik_Popover = (function () {
                 }, 0);
             },
             close: function (event, ui) {
-                // if clicking outside of the dialog, close entire stack
-                if (!event.currentTarget && !$(event.currentTarget).is('button')) {
-                    broadcast.resetPopoverStack();
-                }
-
                 container.find('div.jqplot-target').trigger('piwikDestroyPlot');
                 container[0].innerHTML = '';
                 container.dialog('destroy').remove();
@@ -70,7 +67,7 @@ var Piwik_Popover = (function () {
 
                 // if we were not called by Piwik_Popover.close(), then the user clicked the close button or clicked
                 // the overlay, in which case we want to handle the popover URL as well as the actual modal.
-                if (!isProgrammaticClose) {
+                if (!isProgrammaticClose || isEscapeKey(event)) {
                     broadcast.propagateNewPopoverParameter(false);
                 }
             }