aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-23 09:03:50 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-23 09:03:50 +0100
commita25872e0349c3c93a5dea6ce0050f3db207c8dce (patch)
treeadc9da72f8d2fa0d066a2e344ec13fb3f24fe76f /apps/files/js
parentabcee56fe39f55d2071a192543a12376f9dd6d54 (diff)
parentf8ae1bb36e59d1110db24a3fdc5079daa97f3753 (diff)
downloadnextcloud-server-a25872e0349c3c93a5dea6ce0050f3db207c8dce.tar.gz
nextcloud-server-a25872e0349c3c93a5dea6ce0050f3db207c8dce.zip
Merge pull request #23495 from owncloud/disable-paste-zone
Disable pastezone for jquery.fileupload
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/file-upload.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index bd80afd072c..fca69064cde 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -274,6 +274,7 @@ OC.Upload = {
if ( $('#file_upload_start').exists() ) {
var file_upload_param = {
dropZone: $('#content'), // restrict dropZone to content div
+ pasteZone: null,
autoUpload: false,
sequentialUploads: true,
//singleFileUploads is on by default, so the data.files array will always have length 1