diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 13:57:18 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 13:57:18 +0100 |
| commit | a40cedf507a432c0f2afc144fbc3c7dedb438852 (patch) | |
| tree | d77985fcfbd5931d585a61ac2370e8a445dd9452 /core/js/js.js | |
| parent | 0e2ce33ab0e6bd5cd4cda9f0f1c0b9081b75ecde (diff) | |
| parent | 9f0fc30251fbcf0d2a75f91aa8be606e39297fa4 (diff) | |
| download | nextcloud-server-a40cedf507a432c0f2afc144fbc3c7dedb438852.tar.gz nextcloud-server-a40cedf507a432c0f2afc144fbc3c7dedb438852.zip | |
Merge branch 'master' into McNetic-zipstreamer
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index d4d2583f1e5..59d48806418 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -860,6 +860,7 @@ function initCore() { // checkShowCredentials(); // $('input#user, input#password').keyup(checkShowCredentials); + // user menu $('#settings #expand').keydown(function(event) { if (event.which === 13 || event.which === 32) { $('#expand').click() @@ -872,7 +873,8 @@ function initCore() { $('#settings #expanddiv').click(function(event){ event.stopPropagation(); }); - $(document).click(function(){//hide the settings menu when clicking outside it + //hide the user menu when clicking outside it + $(document).click(function(){ $('#settings #expanddiv').slideUp(200); }); |