Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2016-11-27 22:17:55 +0300
committerGitHub <noreply@github.com>2016-11-27 22:17:55 +0300
commitf6a67af29558eb32b500ede0bbcbeb8b139c53b2 (patch)
tree18484e791374024cf2da0bf3d61fd5e8cd71ce07 /plugins/CoreHome/javascripts/broadcast.js
parent5a2a0e4dd41f64a01e3427739d7594881d7ac2d7 (diff)
Minor tweaks and events in Goals UI (#10903)
* added some goal events * add new method to be able to add post params * post events via angular * make sure promo message is always shown at the end * .travis.yml file is out of date, auto-updating .travis.yml file. * improve sparklines view and make goals page hookable * .travis.yml file is out of date, auto-updating .travis.yml file. * .travis.yml file is out of date, auto-updating .travis.yml file. * fix system tests * make sure each goal has an id in the table so we can target them
Diffstat (limited to 'plugins/CoreHome/javascripts/broadcast.js')
-rw-r--r--plugins/CoreHome/javascripts/broadcast.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js
index 3ec2a0821d..eecbc79a95 100644
--- a/plugins/CoreHome/javascripts/broadcast.js
+++ b/plugins/CoreHome/javascripts/broadcast.js
@@ -205,7 +205,11 @@ var broadcast = {
// if the module is not 'Goals', we specifically unset the 'idGoal' parameter
// this is to ensure that the URLs are clean (and that clicks on graphs work as expected - they are broken with the extra parameter)
var action = broadcast.getParamValue('action', currentHashStr);
- if (action != 'goalReport' && action != 'ecommerceReport' && action != 'products' && action != 'sales') {
+ if (action != 'goalReport'
+ && action != 'ecommerceReport'
+ && action != 'products'
+ && action != 'sales'
+ && (''+ ajaxUrl).indexOf('&idGoal=') === -1) {
currentHashStr = broadcast.updateParamValue('idGoal=', currentHashStr);
}
// unset idDashboard if use doesn't display a dashboard