diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-14 22:54:48 +0100 |
| commit | 4b80466880b4e2daf25e38d621a0ebac608d335d (patch) | |
| tree | dfdcac5eb81cea7853d16c50ea3043c4642f3c15 /core/js/js.js | |
| parent | 78a3625ddfc67e7e6743a2ff6fd31e1566b174c8 (diff) | |
| parent | 9058d398a7b9aac58ab4aa7379e13ca83c72281d (diff) | |
| download | nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.tar.gz nextcloud-server-4b80466880b4e2daf25e38d621a0ebac608d335d.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
lib/db.php
lib/files/cache/cache.php
lib/files/cache/legacy.php
lib/setup.php
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 |