diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-08-22 16:11:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 16:11:15 +0200 |
| commit | 04a744742a06f6f274f7d61fa5d0ab3c6fa72203 (patch) | |
| tree | a34e949ecd6edc37d9abf2bfe2c07b9f47ea5c27 /core/js | |
| parent | bb2336f389619ea6dcd0a5fdfa82eb4f8cf28079 (diff) | |
| parent | ba66cad1b46227d5a360aa688b114ad4d5cf0d4d (diff) | |
| download | nextcloud-server-04a744742a06f6f274f7d61fa5d0ab3c6fa72203.tar.gz nextcloud-server-04a744742a06f6f274f7d61fa5d0ab3c6fa72203.zip | |
Merge pull request #10787 from nextcloud/fix/10786/click-the-last-app
Fixes the app menu
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 9 |
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'); |