summaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
Diffstat (limited to 'core/js/js.js')
-rw-r--r--core/js/js.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 2812cba988c..a4de1c3dbf6 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -684,7 +684,12 @@ var OCP = {},
registerMenu: function($toggle, $menuEl, toggle, headerMenu) {
var self = this;
$menuEl.addClass('menu');
- $toggle.on('click.menu keyup.menu', function(event) {
+
+ // On link, the enter key trigger a click event
+ // Only use the click to avoid two fired events
+ $toggle.on($toggle.prop('tagName') === 'A'
+ ? 'click.menu'
+ : 'click.menu keyup.menu', function(event) {
// prevent the link event (append anchor to URL)
event.preventDefault();
@@ -1452,7 +1457,7 @@ function initCore() {
function setupMainMenu() {
// init the more-apps menu
- OC.registerMenu($('#more-apps'), $('#navigation'));
+ OC.registerMenu($('#more-apps > a'), $('#navigation'));
// toggle the navigation
var $toggle = $('#header .header-appname-container');