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

Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfix 

Fixed conflict dialog in IE8
This commit is contained in:
Morris Jobke 2013-10-16 12:52:41 -07:00
parent 2fe9294c5d e2a4417079
commit a132144eca
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();
},
/**

2
core/js/oc-dialogs.js
View File

@ -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) {