Get a 96x96 preview for file conflict resolution
This commit is contained in:
parent
c700f42b68
commit
4e364311f1
|
@ -381,9 +381,15 @@ var OCdialogs = {
|
|||
$replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate));
|
||||
}
|
||||
var path = original.directory + '/' +original.name;
|
||||
Files.lazyLoadPreview(path, original.mimetype, function(previewpath){
|
||||
$originalDiv.find('.icon').css('background-image','url('+previewpath+')');
|
||||
}, 96, 96, original.etag);
|
||||
var urlSpec = {
|
||||
file: path,
|
||||
x: 96,
|
||||
y: 96,
|
||||
c: original.etag,
|
||||
forceIcon: 0
|
||||
};
|
||||
var previewpath = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
|
||||
$originalDiv.find('.icon').css('background-image','url('+previewpath+')');
|
||||
getCroppedPreview(replacement).then(
|
||||
function(path){
|
||||
$replacementDiv.find('.icon').css('background-image','url(' + path + ')');
|
||||
|
|
Loading…
Reference in New Issue