]> source.dussan.org Git - nextcloud-server.git/commitdiff
Don't stop event execution for menu item click
authorMorris Jobke <hey@morrisjobke.de>
Thu, 9 Apr 2015 12:46:26 +0000 (14:46 +0200)
committerMorris Jobke <hey@morrisjobke.de>
Thu, 9 Apr 2015 16:32:33 +0000 (18:32 +0200)
* fixes #12326 - the settings menu is closed now, because the event is executed

core/js/js.js

index 274eddffff760cbf738bec2de354522e7386d977..cb93e73f2e02568d07928a2c2975295945eec951 100644 (file)
@@ -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;
                });
        },