summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-04-07 20:36:15 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-04-07 20:36:15 +0200
commitc86bda03258b35a5df3533939457e987c971bf98 (patch)
treec9429cd9fc372d12923e7dacccb36811fde9e2f5
parent3fde1b434259f852f20ec578e870aa0c04085a70 (diff)
parent3c35e82a37de2e442b275ee8047b7507d2bd6cfd (diff)
downloadnextcloud-server-c86bda03258b35a5df3533939457e987c971bf98.tar.gz
nextcloud-server-c86bda03258b35a5df3533939457e987c971bf98.zip
Merge pull request #8065 from owncloud/avatar-highdpi
use high resolution avatars on highdpi screens
-rw-r--r--core/js/jquery.avatar.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 381c42d9dbb..7c19cb321fe 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -77,7 +77,7 @@
var url = OC.generateUrl(
'/avatar/{user}/{size}?requesttoken={requesttoken}',
- {user: user, size: size, requesttoken: oc_requesttoken});
+ {user: user, size: size * window.devicePixelRatio, requesttoken: oc_requesttoken});
$.get(url, function(result) {
if (typeof(result) === 'object') {
@@ -93,9 +93,9 @@
} else {
$div.show();
if (ie8fix === true) {
- $div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
+ $div.html('<img width="' + size + '" height="' + size + '" src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
} else {
- $div.html('<img src="'+url+'">');
+ $div.html('<img width="' + size + '" height="' + size + '" src="'+url+'">');
}
}
if(typeof callback === 'function') {