瀏覽代碼

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
tags/v6.0.0beta2
Vincent Petry 10 年之前
父節點
當前提交
e2a4417079
共有 2 個檔案被更改,包括 6 行新增2 行删除
  1. 5
    1
      apps/files/js/file-upload.js
  2. 1
    1
      core/js/oc-dialogs.js

+ 5
- 1
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();
},
/**

+ 1
- 1
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) {

Loading…
取消
儲存