From: Morris Jobke Date: Thu, 9 Apr 2015 12:46:26 +0000 (+0200) Subject: Don't stop event execution for menu item click X-Git-Tag: v8.1.0alpha1~45^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=51e4633187919057525b5cc64cb49f1cd439c7a0;p=nextcloud-server.git Don't stop event execution for menu item click * fixes #12326 - the settings menu is closed now, because the event is executed --- diff --git a/core/js/js.js b/core/js/js.js index 274eddffff7..cb93e73f2e0 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -476,11 +476,14 @@ var OC={ registerMenu: function($toggle, $menuEl) { $menuEl.addClass('menu'); $toggle.on('click.menu', function(event) { + // prevent the link event (append anchor to URL) + event.preventDefault(); + if ($menuEl.is(OC._currentMenu)) { $menuEl.slideUp(OC.menuSpeed); OC._currentMenu = null; OC._currentMenuToggle = null; - return false; + return; } // another menu was open? else if (OC._currentMenu) { @@ -490,7 +493,6 @@ var OC={ $menuEl.slideToggle(OC.menuSpeed); OC._currentMenu = $menuEl; OC._currentMenuToggle = $toggle; - return false; }); },