summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-10 10:04:54 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-10 10:04:54 +0100
commit92df8deb0ad4e38bc4eb2b02a8581e738cfa8d9e (patch)
tree9f6ca7d20efd243f54a3670c4fb71f5db468e9d1
parent26513bc17b1119060819e391c3faf2a391769f70 (diff)
parente7d571511408f44c6caffe31e13289d245590954 (diff)
downloadnextcloud-server-92df8deb0ad4e38bc4eb2b02a8581e738cfa8d9e.tar.gz
nextcloud-server-92df8deb0ad4e38bc4eb2b02a8581e738cfa8d9e.zip
Merge pull request #7631 from ichEben/master
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
-rw-r--r--apps/files/js/file-upload.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index b7b8f6fdeb6..ea4061c9b0b 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -180,7 +180,7 @@ OC.Upload = {
},
init: function() {
- if ( $('#file_upload_start').exists() ) {
+ if ( $('#file_upload_start').exists() && $('#file_upload_start').is(':visible')) {
var file_upload_param = {
dropZone: $('#content'), // restrict dropZone to content div