Ensure to close visitor popover correctly (#15443)

matomo-org · Jan 24, 2020 · 5322d05 · 5322d05
1 parent 5cdecb0
commit 5322d05
Showing 1 changed file with 21 additions and 8 deletions.
diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js
@@ -71,14 +71,27 @@
             var self = this,
                 $element = this.$element;
 
-            $element.on('click', '.visitor-profile-close', function (e) {
-                e.preventDefault();
-                try {
-                    $element.tooltip('destroy');
-                } catch (e) {}
-                broadcast.propagateNewPopoverParameter(false);
-                return false;
-            });
+            // if there are no popover params in stack, simply close the popover
+            if (!broadcast.popoverParamStack.length) {
+                $element.on('click', '.visitor-profile-close', function (e) {
+                    e.preventDefault();
+                    try {
+                        $element.tooltip('destroy');
+                    } catch (e) {
+                    }
+                    Piwik_Popover.close();
+                });
+            } else {
+                $element.on('click', '.visitor-profile-close', function (e) {
+                    e.preventDefault();
+                    try {
+                        $element.tooltip('destroy');
+                    } catch (e) {
+                    }
+                    broadcast.propagateNewPopoverParameter(false);
+                    return false;
+                });
+            }
 
             $element.on('click', '.visitor-profile-toggle-actions', function (e) {
                 e.preventDefault();