diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2013-10-16 12:52:41 -0700 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2013-10-16 12:52:41 -0700 |
| commit | a132144ecab68357abd9f387b41fc868b5b01981 (patch) | |
| tree | 3042a543f935fa012df0b7c087380d8a71010480 | |
| parent | 2fe9294c5d65e7e2264a8ddf10985bdd00c83a5a (diff) | |
| parent | e2a4417079c2ddd1263ec9af2d2930eb65e911f7 (diff) | |
| download | nextcloud-server-a132144ecab68357abd9f387b41fc868b5b01981.tar.gz nextcloud-server-a132144ecab68357abd9f387b41fc868b5b01981.zip | |
Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix
Fixed conflict dialog in IE8
| -rw-r--r-- | apps/files/js/file-upload.js | 6 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index c03e9037cec..d0dbd65eaee 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(); }, /** diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index e5e9f6dbb7d..a9b40918ca7 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -234,7 +234,7 @@ var OCdialogs = { var getCroppedPreview = function(file) { var deferred = new $.Deferred(); // Only process image files. - var type = file.type.split('/').shift(); + var type = file.type && file.type.split('/').shift(); if (window.FileReader && type === 'image') { var reader = new FileReader(); reader.onload = function (e) { |