use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there

This commit is contained in:
Jörn Friedrich Dreyer 2013-09-19 10:00:42 +02:00
parent f7800cd63e
commit 0d81a53e12
2 changed files with 9 additions and 5 deletions

View File

@ -627,11 +627,15 @@ function getPathForPreview(name) {
return path; return path;
} }
function lazyLoadPreview(path, mime, ready) { function lazyLoadPreview(path, mime, ready, width, height) {
getMimeIcon(mime,ready); getMimeIcon(mime,ready);
var x = $('#filestable').data('preview-x'); if (!width) {
var y = $('#filestable').data('preview-y'); width = $('#filestable').data('preview-x');
var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:x, y:y}); }
if (!height) {
height = $('#filestable').data('preview-y');
}
var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:width, y:height});
$.get(previewURL, function() { $.get(previewURL, function() {
previewURL = previewURL.replace('(','%28'); previewURL = previewURL.replace('(','%28');
previewURL = previewURL.replace(')','%29'); previewURL = previewURL.replace(')','%29');

View File

@ -296,7 +296,7 @@ var OCdialogs = {
var path = getPathForPreview(original.name); var path = getPathForPreview(original.name);
lazyLoadPreview(path, original.type, function(previewpath){ lazyLoadPreview(path, original.type, function(previewpath){
conflict.find('.original .icon').css('background-image','url('+previewpath+')'); conflict.find('.original .icon').css('background-image','url('+previewpath+')');
}); }, 96, 96);
getCroppedPreview(replacement).then( getCroppedPreview(replacement).then(
function(path){ function(path){
conflict.find('.replacement .icon').css('background-image','url(' + path + ')'); conflict.find('.replacement .icon').css('background-image','url(' + path + ')');