diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-03-17 13:47:54 +0100 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-03-26 00:40:30 +0100 |
commit | 095197d1a772e2fd3590818eaad0d51ad013959c (patch) | |
tree | 73e489e7371fcf6c8f520aeb4d5dd0042c568dca /core/js/js.js | |
parent | dac443680748f5bd482ad2a0ce231ec89b34981c (diff) | |
download | nextcloud-server-095197d1a772e2fd3590818eaad0d51ad013959c.tar.gz nextcloud-server-095197d1a772e2fd3590818eaad0d51ad013959c.zip |
popover style for apps and user dropdown menus
Diffstat (limited to 'core/js/js.js')
-rw-r--r-- | core/js/js.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/js/js.js b/core/js/js.js index 00adcc514bc..378af83d090 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -477,7 +477,7 @@ var OC={ $menuEl.addClass('menu'); $toggle.on('click.menu', function(event) { if ($menuEl.is(OC._currentMenu)) { - $menuEl.slideUp(OC.menuSpeed); + $menuEl.hide(); OC._currentMenu = null; OC._currentMenuToggle = null; return false; @@ -487,7 +487,7 @@ var OC={ // close it OC._currentMenu.hide(); } - $menuEl.slideToggle(OC.menuSpeed); + $menuEl.toggle(); OC._currentMenu = $menuEl; OC._currentMenuToggle = $toggle; return false; @@ -500,7 +500,7 @@ var OC={ unregisterMenu: function($toggle, $menuEl) { // close menu if opened if ($menuEl.is(OC._currentMenu)) { - $menuEl.slideUp(OC.menuSpeed); + $menuEl.hide(); OC._currentMenu = null; OC._currentMenuToggle = null; } @@ -1128,7 +1128,7 @@ function initCore() { } }); $('#settings #expand').click(function(event) { - $('#settings #expanddiv').slideToggle(OC.menuSpeed); + $('#settings #expanddiv').toggle(); event.stopPropagation(); }); $('#settings #expanddiv').click(function(event){ @@ -1136,7 +1136,7 @@ function initCore() { }); //hide the user menu when clicking outside it $(document).click(function(){ - $('#settings #expanddiv').slideUp(OC.menuSpeed); + $('#settings #expanddiv').hide(); }); // all the tipsy stuff needs to be here (in reverse order) to work @@ -1159,7 +1159,7 @@ function initCore() { return false; } if (OC._currentMenu) { - OC._currentMenu.slideUp(OC.menuSpeed); + OC._currentMenu.hide(); } OC._currentMenu = null; OC._currentMenuToggle = null; |