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

Get a 96x96 preview for file conflict resolution

This commit is contained in:
Olivier Paroz 2015-05-29 13:49:51 +02:00
parent c700f42b68
commit 4e364311f1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,9 +381,15 @@ var OCdialogs = {
$replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate)); $replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate));
} }
var path = original.directory + '/' +original.name; var path = original.directory + '/' +original.name;
Files.lazyLoadPreview(path, original.mimetype, function(previewpath){ 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+')'); $originalDiv.find('.icon').css('background-image','url('+previewpath+')');
}, 96, 96, original.etag);
getCroppedPreview(replacement).then( getCroppedPreview(replacement).then(
function(path){ function(path){
$replacementDiv.find('.icon').css('background-image','url(' + path + ')'); $replacementDiv.find('.icon').css('background-image','url(' + path + ')');