Don't stop event execution for menu item click

* fixes #12326 - the settings menu is closed now, because the event is executed
remotes/origin/poc-doctrine-migrations
Morris Jobke 2015-04-09 14:46:26 +07:00
parent c840c18252
commit 51e4633187
1 changed files with 4 additions and 2 deletions

@ -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;
});
},