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

Fixed mime type attribute access in file overwrite dialog

This commit is contained in:
Vincent Petry 2014-04-03 16:55:01 +02:00
parent 3101663129
commit 2b8bb01211
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,7 +294,7 @@ var OCdialogs = {
conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
} }
var path = original.directory + '/' +original.name; var path = original.directory + '/' +original.name;
Files.lazyLoadPreview(path, original.mime, function(previewpath){ Files.lazyLoadPreview(path, original.mimetype, function(previewpath){
conflict.find('.original .icon').css('background-image','url('+previewpath+')'); conflict.find('.original .icon').css('background-image','url('+previewpath+')');
}, 96, 96, original.etag); }, 96, 96, original.etag);
getCroppedPreview(replacement).then( getCroppedPreview(replacement).then(