diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-17 09:41:37 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-17 09:41:37 +0100 |
commit | 325746ae45506dad6003f55fe951243be9db3c77 (patch) | |
tree | 526975163d93bce4b3cecd389ad9a6649769cfed /core/js/js.js | |
parent | 808a13922c8bc002e697f3bbe84be70a2c715cf6 (diff) | |
parent | 0f8058cb12ed97dba45ab8b2f48b7321662bbd2e (diff) | |
download | nextcloud-server-325746ae45506dad6003f55fe951243be9db3c77.tar.gz nextcloud-server-325746ae45506dad6003f55fe951243be9db3c77.zip |
Merge branch 'master' into fix-googledrive
Diffstat (limited to 'core/js/js.js')
-rw-r--r-- | core/js/js.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js index ae23c955c38..6d5d65403fb 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -663,14 +663,14 @@ $(document).ready(function(){ } }); $('#settings #expand').click(function(event) { - $('#settings #expanddiv').slideToggle(); + $('#settings #expanddiv').slideToggle(200); event.stopPropagation(); }); $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); $(window).click(function(){//hide the settings menu when clicking outside it - $('#settings #expanddiv').slideUp(); + $('#settings #expanddiv').slideUp(200); }); // all the tipsy stuff needs to be here (in reverse order) to work |