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

Merge pull request #8058 from owncloud/preview-highdpi 

Show higher resolution previews for high dpi screens
This commit is contained in:
Vincent Petry 2014-04-04 18:45:49 +02:00
parent 4028301dea 01d93f81f6
commit 710bbd3491
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/js/files.js
View File

@ -663,6 +663,8 @@ Files.generatePreviewUrl = function(urlSpec) {
if (!urlSpec.y) { if (!urlSpec.y) {
urlSpec.y = $('#filestable').data('preview-y'); urlSpec.y = $('#filestable').data('preview-y');
} }
urlSpec.y *= window.devicePixelRatio;
urlSpec.x *= window.devicePixelRatio;
urlSpec.forceIcon = 0; urlSpec.forceIcon = 0;
return OC.generateUrl('/core/preview.png?') + $.param(urlSpec); return OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
} }
@ -670,7 +672,7 @@ Files.generatePreviewUrl = function(urlSpec) {
Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) { Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
// get mime icon url // get mime icon url
Files.getMimeIcon(mime, function(iconURL) { Files.getMimeIcon(mime, function(iconURL) {
var previewURL; var previewURL,
urlSpec = {}; urlSpec = {};
ready(iconURL); // set mimeicon URL ready(iconURL); // set mimeicon URL
@ -696,7 +698,7 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
if (img.width > 5) { if (img.width > 5) {
ready(previewURL); ready(previewURL);
} }
} };
img.src = previewURL; img.src = previewURL;
}); });
}; };

4
core/js/compatibility.js
View File

@ -148,3 +148,7 @@ function outerHTML(node){
return h; return h;
})(node); })(node);
} }
// devicePixelRatio for IE10
window.devicePixelRatio = window.devicePixelRatio ||
window.screen.deviceXDPI / window.screen.logicalXDPI || 1;