diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-23 09:03:50 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-23 09:03:50 +0100 |
| commit | a25872e0349c3c93a5dea6ce0050f3db207c8dce (patch) | |
| tree | adc9da72f8d2fa0d066a2e344ec13fb3f24fe76f | |
| parent | abcee56fe39f55d2071a192543a12376f9dd6d54 (diff) | |
| parent | f8ae1bb36e59d1110db24a3fdc5079daa97f3753 (diff) | |
| download | nextcloud-server-a25872e0349c3c93a5dea6ce0050f3db207c8dce.tar.gz nextcloud-server-a25872e0349c3c93a5dea6ce0050f3db207c8dce.zip | |
Merge pull request #23495 from owncloud/disable-paste-zone
Disable pastezone for jquery.fileupload
| -rw-r--r-- | apps/files/js/file-upload.js | 1 | ||||
| -rw-r--r-- | settings/js/certificates.js | 1 | ||||
| -rw-r--r-- | settings/js/personal.js | 1 |
3 files changed, 3 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 diff --git a/settings/js/certificates.js b/settings/js/certificates.js index 9ce9f9aa8d8..f2a8e6b0afb 100644 --- a/settings/js/certificates.js +++ b/settings/js/certificates.js @@ -16,6 +16,7 @@ $(document).ready(function () { $('#sslCertificate tr > td').tipsy({gravity: 'n', live: true}); $('#rootcert_import').fileupload({ + pasteZone: null, submit: function (e, data) { data.formData = _.extend(data.formData || {}, { requesttoken: OC.requestToken diff --git a/settings/js/personal.js b/settings/js/personal.js index 3b2316d0614..bd13b7fd251 100644 --- a/settings/js/personal.js +++ b/settings/js/personal.js @@ -244,6 +244,7 @@ $(document).ready(function () { }); var uploadparms = { + pasteZone: null, done: function (e, data) { var response = data; if (typeof data.result === 'string') { |