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

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index afbb14c5e004993ecc200bcce186790da7135df1..76f19b87cbcbbd044851e48baa5cbcae80b8c4f0 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -627,11 +627,15 @@ function getPathForPreview(name) {
        return path;
 }
 
-function lazyLoadPreview(path, mime, ready) {
+function lazyLoadPreview(path, mime, ready, width, height) {
        getMimeIcon(mime,ready);
-       var x = $('#filestable').data('preview-x');
-       var y = $('#filestable').data('preview-y');
-       var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:x, y:y});
+       if (!width) {
+               width = $('#filestable').data('preview-x');
+       }
+       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() {
                previewURL = previewURL.replace('(','%28');
                previewURL = previewURL.replace(')','%29');

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 7ca94dcbaa4b0ea838f6cca74b0e8977cac25b5f..d661a871a5ff92caad6ba894636e112c7b63efcc 100644 (file)
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -296,7 +296,7 @@ var OCdialogs = {
                        var path = getPathForPreview(original.name);
                        lazyLoadPreview(path, original.type, function(previewpath){
                                conflict.find('.original .icon').css('background-image','url('+previewpath+')');
-                       });
+                       }, 96, 96);
                        getCroppedPreview(replacement).then(
                                function(path){
                                        conflict.find('.replacement .icon').css('background-image','url(' + path + ')');