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
This commit is contained in:
parent
e276ffedd3
commit
e2a4417079
2 changed files with 6 additions and 2 deletions
|
@ -124,7 +124,11 @@ OC.Upload = {
|
|||
*/
|
||||
onReplace:function(data){
|
||||
this.log('replace', null, data);
|
||||
if (data.data){
|
||||
data.data.append('resolution', 'replace');
|
||||
} else {
|
||||
data.formData.push({name:'resolution',value:'replace'}); //hack for ie8
|
||||
}
|
||||
data.submit();
|
||||
},
|
||||
/**
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue