summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2013-10-30 10:38:03 -0700
committerVincent Petry <pvince81@owncloud.com>2013-10-30 10:38:03 -0700
commitcdb3c746327619009c1af10b2adbd610cb140ccc (patch)
tree21afceec697cf66f33edcb7317160fc57a79c3b6 /apps
parentca4a1ee5f7e223b521e41784b0d9b7ed2af162af (diff)
parent19eeb618ff5332c7b6b1efad7350c1a8c2851bd4 (diff)
downloadnextcloud-server-cdb3c746327619009c1af10b2adbd610cb140ccc.tar.gz
nextcloud-server-cdb3c746327619009c1af10b2adbd610cb140ccc.zip
Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick
Prevent closing the create dropdown when right clicking in Firefox
Diffstat (limited to 'apps')
-rw-r--r--apps/files/js/file-upload.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 95c0723f254..8c56f1cb364 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -465,7 +465,11 @@ $(document).ready(function() {
crumb.text(text);
}
- $(document).click(function() {
+ $(document).click(function(ev) {
+ // do not close when clicking in the dropdown
+ if ($(ev.target).closest('#new').length){
+ return;
+ }
$('#new>ul').hide();
$('#new').removeClass('active');
if ($('#new .error').length > 0) {