diff options
author | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 14:26:59 +0100 |
---|---|---|
committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-25 14:26:59 +0100 |
commit | 4c980a4851804c4f5379e364e106edacd04c42e4 (patch) | |
tree | 0ad2d8efe8affc59cdeeb65edfec05e45a07c8db /apps/files/js/files.js | |
parent | 632ca9f06d2247061b7f03ce9bfcd0402bd92441 (diff) | |
parent | a37577e007ef458e31d3484b5f969ea0e98545f3 (diff) | |
download | nextcloud-server-4c980a4851804c4f5379e364e106edacd04c42e4.tar.gz nextcloud-server-4c980a4851804c4f5379e364e106edacd04c42e4.zip |
Merge branch 'master' into update-expire-function
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r-- | apps/files/js/files.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 6801fb59910..74b2e48fb02 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -524,7 +524,7 @@ $(document).ready(function() { crumb.text(text); } - $(window).click(function(){ + $(document).click(function(){ $('#new>ul').hide(); $('#new').removeClass('active'); $('#new li').each(function(i,element){ |