summaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-09-19 10:00:42 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-09-19 10:00:42 +0200
commit0d81a53e12bed66e5ec9684424519913283110a5 (patch)
treec98217ccf47a8eebb3c68e3ffb42985d6a9b1f1c /apps/files
parentf7800cd63ef55b9fc0e8379291adeb9e45356fb1 (diff)
downloadnextcloud-server-0d81a53e12bed66e5ec9684424519913283110a5.tar.gz
nextcloud-server-0d81a53e12bed66e5ec9684424519913283110a5.zip
use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/files.js12
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index afbb14c5e00..76f19b87cbc 100644
--- 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');