wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed conflict dialog in IE8

Browse source 
- Fixed JS error that prevent the conflict dialog to open #5060
- Fixed JS error that prevented the overwrite case to run
This commit is contained in:
Vincent Petry 2013-10-10 15:54:00 +02:00
parent e276ffedd3
commit e2a4417079
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) {