Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview
Get a 96x96 preview for file conflict resolution
This commit is contained in:
commit
d2f3710ede
|
@ -381,9 +381,17 @@ 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 = {
|
||||||
$originalDiv.find('.icon').css('background-image','url('+previewpath+')');
|
file: path,
|
||||||
}, 96, 96, original.etag);
|
x: 96,
|
||||||
|
y: 96,
|
||||||
|
c: original.etag,
|
||||||
|
forceIcon: 0
|
||||||
|
};
|
||||||
|
var previewpath = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
|
||||||
|
// Escaping single quotes
|
||||||
|
previewpath = previewpath.replace(/'/g, "%27")
|
||||||
|
$originalDiv.find('.icon').css({"background-image": "url('" + previewpath + "')"});
|
||||||
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 + ')');
|
||||||
|
|
Loading…
Reference in New Issue