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:
authorMatthieu Aubry <matt@piwik.org>2015-03-19 11:47:31 +0300
committerMatthieu Aubry <matt@piwik.org>2015-03-19 11:47:31 +0300
commitf6fff6c5d32e78f4888ce1b70fe2170f148fd1ef (patch)
treeef6eb7465bbae390b04abf59826ac437c889a2d0 /plugins/CoreHome/javascripts/menu.js
parenta2f9c2537578786137a1a8664fdd1e47a02a8906 (diff)
parentbd22df313441ebd6d1511d8285d22bc0e2042fcf (diff)
Merge pull request #7478 from piwik/menu-middle-click2.12.0-rc1
The menu does not intercept middle mouse clicks anymore
Diffstat (limited to 'plugins/CoreHome/javascripts/menu.js')
-rw-r--r--plugins/CoreHome/javascripts/menu.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/plugins/CoreHome/javascripts/menu.js b/plugins/CoreHome/javascripts/menu.js
index b229a0fab5..128a22188c 100644
--- a/plugins/CoreHome/javascripts/menu.js
+++ b/plugins/CoreHome/javascripts/menu.js
@@ -38,9 +38,12 @@ menu.prototype =
}, 2000);
},
- onItemClick: function (item) {
- $('.Menu--dashboard').trigger('piwikSwitchPage', item);
- broadcast.propagateAjax( $(item).attr('href').substr(1) );
+ onItemClick: function (e) {
+ if (e.which !== 1) {
+ return;
+ }
+ $('.Menu--dashboard').trigger('piwikSwitchPage', this);
+ broadcast.propagateAjax( $(this).attr('href').substr(1) );
return false;
},
@@ -81,6 +84,8 @@ menu.prototype =
}
});
+ this.menuNode.find('a.item').click(this.onItemClick);
+
menu.prototype.adaptSubMenuHeight();
},