diff options
| -rw-r--r-- | apps/files/css/files.css | 4 | ||||
| -rw-r--r-- | apps/files/js/file-upload.js | 6 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 16 |
3 files changed, 19 insertions, 7 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 65aa29052e6..ea9c99bb269 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -380,6 +380,10 @@ table.dragshadow td.size { float: left; width: 235px; } +html.lte9 .oc-dialog .fileexists .original { + float: left; + width: 225px; +} .oc-dialog .fileexists .conflicts { overflow-y:scroll; max-height: 225px; diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 47d1188b511..ead397c569e 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -197,7 +197,11 @@ OC.Upload = { }, onAutorename:function(data){ this.logStatus('autorename', null, data); - data.data.append('resolution', 'autorename'); + if (data.data) { + data.data.append('resolution', 'autorename'); + } else { + data.formData.push({name:'resolution',value:'autorename'}); //hack for ie8 + } data.submit(); }, logStatus:function(caption, e, data) { diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index bc460798350..82bf49fc3a7 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -229,8 +229,11 @@ var OCdialogs = { conflict.find('.filename').text(original.name); conflict.find('.original .size').text(humanFileSize(original.size)); conflict.find('.original .mtime').text(formatDate(original.mtime*1000)); - conflict.find('.replacement .size').text(humanFileSize(replacement.size)); - conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); + // ie sucks + if (replacement.size && replacement.lastModifiedDate) { + conflict.find('.replacement .size').text(humanFileSize(replacement.size)); + conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); + } var path = getPathForPreview(original.name); lazyLoadPreview(path, original.type, function(previewpath){ conflict.find('.original .icon').css('background-image','url('+previewpath+')'); @@ -242,18 +245,19 @@ var OCdialogs = { conflicts.append(conflict); //set more recent mtime bold - if (replacement.lastModifiedDate.getTime() > original.mtime*1000) { + // ie sucks + if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime*1000) { conflict.find('.replacement .mtime').css('font-weight', 'bold'); - } else if (replacement.lastModifiedDate.getTime() < original.mtime*1000) { + } else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime*1000) { conflict.find('.original .mtime').css('font-weight', 'bold'); } else { //TODO add to same mtime collection? } // set bigger size bold - if (replacement.size > original.size) { + if (replacement.size && replacement.size > original.size) { conflict.find('.replacement .size').css('font-weight', 'bold'); - } else if (replacement.size < original.size) { + } else if (replacement.size && replacement.size < original.size) { conflict.find('.original .size').css('font-weight', 'bold'); } else { //TODO add to same size collection? |