diff options
-rw-r--r-- | plugins/CoreHome/javascripts/menu.js | 11 | ||||
-rw-r--r-- | plugins/CoreHome/templates/_menu.twig | 10 |
2 files changed, 9 insertions, 12 deletions
diff --git a/plugins/CoreHome/javascripts/menu.js b/plugins/CoreHome/javascripts/menu.js index 128a22188c..b229a0fab5 100644 --- a/plugins/CoreHome/javascripts/menu.js +++ b/plugins/CoreHome/javascripts/menu.js @@ -38,12 +38,9 @@ menu.prototype = }, 2000); }, - onItemClick: function (e) { - if (e.which !== 1) { - return; - } - $('.Menu--dashboard').trigger('piwikSwitchPage', this); - broadcast.propagateAjax( $(this).attr('href').substr(1) ); + onItemClick: function (item) { + $('.Menu--dashboard').trigger('piwikSwitchPage', item); + broadcast.propagateAjax( $(item).attr('href').substr(1) ); return false; }, @@ -84,8 +81,6 @@ menu.prototype = } }); - this.menuNode.find('a.item').click(this.onItemClick); - menu.prototype.adaptSubMenuHeight(); }, diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index 63c1d75aca..f46264879b 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -1,7 +1,8 @@ {% macro submenuItem(name, url) %} {% if name|slice(0,1) != '_' %} <li> - <a class="item" href='#{{ url|urlRewriteWithParameters|slice(1) }}'> + <a href='#{{ url|urlRewriteWithParameters|slice(1) }}' + onclick='return piwikMenu.onItemClick(this);'> {{ name|translate }} </a> </li> @@ -14,7 +15,8 @@ {% for item in group.getItems %} <a class="item" href='#{{ item.url|urlRewriteWithParameters|slice(1) }}' - {% if item.tooltip %}title="{{ item.tooltip|e('html_attr') }}"{% endif %}> + {% if item.tooltip %}title="{{ item.tooltip|e('html_attr') }}"{% endif %} + onclick='return piwikMenu.onItemClick(this);'> {{ item.name|translate }} </a> {% endfor %} @@ -39,8 +41,8 @@ <ul class="Menu-tabList"> {% for level1,level2 in menu %} <li id="{% if level2._url is defined %}{{ _self.getId(level2._url) }}{% endif %}"> - <a class="item" {% if level2._url is defined %}href="#{{ _self.getFirstUrl(level2._url) }}"{% endif %}> - {{ level1|translate }} + <a {% if level2._url is defined %}href="#{{ _self.getFirstUrl(level2._url) }}"{% endif %} + onclick="return piwikMenu.onItemClick(this);">{{ level1|translate }} <span class="hidden"> {{ 'CoreHome_Menu'|translate }} </span> |