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

Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview 

Get a 96x96 preview for file conflict resolution
This commit is contained in:
Morris Jobke 2015-06-02 09:36:51 +02:00
parent cf2c599218 f05ac47eb6
commit d2f3710ede
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -381,9 +381,17 @@ 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);
// Escaping single quotes
previewpath = previewpath.replace(/'/g, "%27")
$originalDiv.find('.icon').css({"background-image": "url('" + previewpath + "')"});
getCroppedPreview(replacement).then(
function(path){
$replacementDiv.find('.icon').css('background-image','url(' + path + ')');