diff options
author | Stefan Giehl <stefan@matomo.org> | 2020-02-11 11:38:48 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-11 11:38:47 +0300 |
commit | 5d2dab75e3654126ed95ea72b58b4c225ac59492 (patch) | |
tree | 7886dcc7c8593906fbebbca49c7946405bcfa2cc /plugins/Live | |
parent | ab1e70016dde3ef93498bca99d0aa8b38e6d7f38 (diff) |
Merge branch 3.x-dev into 4.x-dev (#15543)
* Updates search engine and social definitions (#15384)
* updates device detector to latest release (#15388)
* updates device detector to latest release
* updates tests
* translation update (#15389)
* Fix Could not get the lock for ID, when creating a site (#15401)
* Lock key start
* do not empty key lock
Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
* 3.13.1
* submodule updates
* Use correct name in update available message (#15423)
* Fix removing user capabilities (#15422)
* Order of implode() args, avoid E_NOTICE in PHP7.4 (#15428)
* Fixes possible php warning in visitor log (#15442)
* silence is_executable call (#15446)
* Make sure geolocation admin experience is consistent if user is not using GeoIp2 plugin. (#15447)
* Fix referrers test. (#15448)
* Ensure to close visitor popover correctly (#15443)
* Fixes possible warning (#15453)
* Forward instance_id from local config when reseting config during tests. (#15445)
* Add event that allows plugins to disable archiving for certain periods/sites if they want. (#15457)
* Add event that allows plugins to disable archiving for certain periods/sites if they want.
* apply review feedback
* Fix possible warning for columns without index (#15467)
* Day range archiving issue (#15462)
* Improve lock ID check for max length (#15407)
Better patch for https://github.com/matomo-org/matomo/pull/15401 which was merged last minute...
This way it always works even when someone calls `acquireLock` directly instead of `execute`
Pushing this for now into 3.x-dev but can also put it into 4.x-dev directly but then there might be merge conflicts when merging 3.x-dev into 4.x-dev
* Use SameSite none for session token when embedded into iframe (#15439)
* Make sure tracking works in IE9 and lower (#15480)
* Mention Joomla install FAQ (#15481)
* Make sparklines work when mbstring extension is not installed (#15489)
1) Too few arguments to function mb_strtolower(), 1 passed in matomo/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php on line 129 and exactly 2 expected
2) mb_strlen is not defined
* update screenshots (#15488)
* 3.13.2-rc1
* Use safemode when running CLI commands (#15472)
* update icons submodule (#15490)
* update icons submodule
* update UI tests
* Fix possible undefined index notice (#15502)
* Use latest davaxi/sparkline release (#15464)
* translation update
* submodule updates
* Fix deprecation notice (#15530)
see https://github.com/matomo-org/matomo/pull/15467#issuecomment-583283444
* 3.13.2-rc2
* update cache component (#15536)
* fixes copy dashboard to user for more than 100 users (#15538)
cherry picking #15424 to fix #15420 in 3.x-dev
* Add missing return statement. (#15539)
* 3.13.2
* update tests
* update tests
Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Co-authored-by: Peter Upfold <pgithub@upfold.org.uk>
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Co-authored-by: Lukas Winkler <github@lw1.at>
Diffstat (limited to 'plugins/Live')
-rw-r--r-- | plugins/Live/Visualizations/VisitorLog.php | 7 | ||||
-rw-r--r-- | plugins/Live/javascripts/visitorProfile.js | 29 |
2 files changed, 26 insertions, 10 deletions
diff --git a/plugins/Live/Visualizations/VisitorLog.php b/plugins/Live/Visualizations/VisitorLog.php index d6c3cd08a2..937bfec893 100644 --- a/plugins/Live/Visualizations/VisitorLog.php +++ b/plugins/Live/Visualizations/VisitorLog.php @@ -260,11 +260,14 @@ class VisitorLog extends Visualization } $action = $group['pageviewAction']; + $actionUrl = !empty($action['url']) ? $action['url'] : ''; + $actionTitle = !empty($action['pageTitle']) ? $action['pageTitle'] : ''; $lastActionGroup = $actionGroups[$previousId]; + $lastGroupUrl = !empty($lastActionGroup['pageviewAction']['url']) ? $lastActionGroup['pageviewAction']['url'] : ''; + $lastGroupTitle = !empty($lastActionGroup['pageviewAction']['pageTitle']) ? $lastActionGroup['pageviewAction']['pageTitle'] : ''; $isLastGroupEmpty = empty($actionGroups[$previousId]['actionsOnPage']); - $isPageviewActionSame = $lastActionGroup['pageviewAction']['url'] == $action['url'] - && $lastActionGroup['pageviewAction']['pageTitle'] == $action['pageTitle']; + $isPageviewActionSame = $lastGroupUrl == $actionUrl && $lastGroupTitle == $actionTitle; // if the current action has the same url/action name as the last, merge w/ the last action group if ($isLastGroupEmpty diff --git a/plugins/Live/javascripts/visitorProfile.js b/plugins/Live/javascripts/visitorProfile.js index 021908f2e8..c533561887 100644 --- 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(); |