mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24281 from owncloud/backport-disable-paste-zone 

[stable9] Disable pastezone for jquery.fileupload
This commit is contained in:
C. Montero Luque 2016-04-26 14:49:38 -04:00
parent 9a1688db7c a70d6f6a62
commit 438d451391
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/files/js/file-upload.js
View File

@ -274,6 +274,7 @@ OC.Upload = {
if ( $('#file_upload_start').exists() ) { if ( $('#file_upload_start').exists() ) {
var file_upload_param = { var file_upload_param = {
dropZone: $('#content'), // restrict dropZone to content div dropZone: $('#content'), // restrict dropZone to content div
pasteZone: null,
autoUpload: false, autoUpload: false,
sequentialUploads: true, sequentialUploads: true,
//singleFileUploads is on by default, so the data.files array will always have length 1 //singleFileUploads is on by default, so the data.files array will always have length 1

1
settings/js/certificates.js
View File

@ -16,6 +16,7 @@ $(document).ready(function () {
$('#sslCertificate tr > td').tipsy({gravity: 'n', live: true}); $('#sslCertificate tr > td').tipsy({gravity: 'n', live: true});
$('#rootcert_import').fileupload({ $('#rootcert_import').fileupload({
pasteZone: null,
submit: function (e, data) { submit: function (e, data) {
data.formData = _.extend(data.formData || {}, { data.formData = _.extend(data.formData || {}, {
requesttoken: OC.requestToken requesttoken: OC.requestToken

1
settings/js/personal.js
View File

@ -244,6 +244,7 @@ $(document).ready(function () {
}); });
var uploadparms = { var uploadparms = {
pasteZone: null,
done: function (e, data) { done: function (e, data) {
var response = data; var response = data;
if (typeof data.result === 'string') { if (typeof data.result === 'string') {