Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-05 20:16:00 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

reintroduce quick animation for menus

Browse Source
This commit is contained in:
Jan-Christoph Borchardt 2015-03-26 11:59:30 +01:00
parent 07335c844a
commit 30b745fc59
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/js/js.js
View File

@ -75,7 +75,7 @@ var OC={
appConfig: window.oc_appconfig || {},
theme: window.oc_defaults || {},
coreApps:['', 'admin','log','core/search','settings','core','3rdparty'],
menuSpeed: 100,
menuSpeed: 50,
/**
* Get an absolute url to a file in an app
@ -477,7 +477,7 @@ var OC={
$menuEl.addClass('menu');
$toggle.on('click.menu', function(event) {
if ($menuEl.is(OC._currentMenu)) {
$menuEl.hide();
$menuEl.slideUp(OC.menuSpeed);
OC._currentMenu = null;
OC._currentMenuToggle = null;
return false;
@ -487,7 +487,7 @@ var OC={
// close it
OC._currentMenu.hide();
}
$menuEl.toggle();
$menuEl.slideToggle(OC.menuSpeed);
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.hide();
$menuEl.slideUp(OC.menuSpeed);
OC._currentMenu = null;
OC._currentMenuToggle = null;
}
@ -1128,7 +1128,7 @@ function initCore() {
}
});
$('#settings #expand').click(function(event) {
$('#settings #expanddiv').toggle();
$('#settings #expanddiv').slideToggle(OC.menuSpeed);
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').hide();
$('#settings #expanddiv').slideUp(OC.menuSpeed);
});
// move triangle of apps dropdown to align with app name triangle
@ -1166,7 +1166,7 @@ function initCore() {
return false;
}
if (OC._currentMenu) {
OC._currentMenu.hide();
OC._currentMenu.slideUp(OC.menuSpeed);
}
OC._currentMenu = null;
OC._currentMenuToggle = null;