diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-10-10 15:54:00 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-10-10 15:54:00 +0200 |
| commit | e2a4417079c2ddd1263ec9af2d2930eb65e911f7 (patch) | |
| tree | bb061363b5acffefe29c9de08fd38f5aa02fd1fb /apps | |
| parent | e276ffedd3d979c43067c53dd87e8024cd782352 (diff) | |
| download | nextcloud-server-e2a4417079c2ddd1263ec9af2d2930eb65e911f7.tar.gz nextcloud-server-e2a4417079c2ddd1263ec9af2d2930eb65e911f7.zip | |
Fixed conflict dialog in IE8
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index f1ef485fc3d..eb42d604ed3 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -124,7 +124,11 @@ OC.Upload = { */ onReplace:function(data){ this.log('replace', null, data); - data.data.append('resolution', 'replace'); + if (data.data){ + data.data.append('resolution', 'replace'); + } else { + data.formData.push({name:'resolution',value:'replace'}); //hack for ie8 + } data.submit(); }, /** |