diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-17 19:10:46 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-17 19:10:46 +0200 |
| commit | b59ce403d8ea80ba7aac5683f667853218757502 (patch) | |
| tree | 2e657117cc3e9fd7a8dfe032945cb1e9a63edc46 /apps/files/js/file-upload.js | |
| parent | 2c9b3d32efa466b655a7f24c5022a42045ef482f (diff) | |
| parent | 9d18e16c77e8c2690dd23dd19ca1f8e1968161c8 (diff) | |
| download | nextcloud-server-b59ce403d8ea80ba7aac5683f667853218757502.tar.gz nextcloud-server-b59ce403d8ea80ba7aac5683f667853218757502.zip | |
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/css/files.css
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files_sharing/js/public.js
core/js/jquery.ocdialog.js
core/js/oc-dialogs.js
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index e5b3f807580..28270f13938 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -298,8 +298,15 @@ $(document).ready(function() { start: function(e) { OC.Upload.logStatus('start', e, null); }, - submit: function (e, data) { + submit: function(e, data) { OC.Upload.rememberUpload(data); + if ( ! data.formData ) { + // noone set update parameters, we set the minimum + data.formData = { + requesttoken: oc_requesttoken, + dir: $('#dir').val() + }; + } }, fail: function(e, data) { OC.Upload.logStatus('fail', e, data); @@ -421,9 +428,7 @@ $(document).ready(function() { // http://stackoverflow.com/a/6700/11236 var size = 0, key; for (key in obj) { - if (obj.hasOwnProperty(key)) { - size++; - } + if (obj.hasOwnProperty(key)) size++; } return size; }; |