Browse Source

Set width/height for buddy image (currently hardcoded to 46 pixels).

pull/15/head
Joachim Bauch 11 years ago
parent
commit
aef44cd43b
  1. 26
      static/js/services/buddylist.js
  2. 4
      static/partials/buddy.html

26
static/js/services/buddylist.js

@ -317,17 +317,19 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text!
}; };
Buddylist.prototype.updateBuddyPicture = function(url) { Buddylist.prototype.updateBuddyPicture = function(status) {
if (url.indexOf("data:") === 0) { url = status.buddyPicture
// can use data: urls directly if (!url) {
return url; return;
} else if (url.indexOf("img:") === 0) {
return mediaStream.config.B + "static/img/buddy/"+url.substr(4);
} }
console.log("Unknown buddy picture url", url); if (url.indexOf("img:") === 0) {
return url; url = url.substr(4);
// NOTE: buddy image size currently is hardcoded
status.buddyPictureWidth = status.buddyPictureHeight = 46;
status.buddyPicture = mediaStream.config.B + "static/img/buddy/s46/"+url;
}
}; };
@ -340,9 +342,7 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text!
console.warn("Received old status update in status", status.Rev, scope.status.Rev); console.warn("Received old status update in status", status.Rev, scope.status.Rev);
} else { } else {
scope.status = status.Status; scope.status = status.Status;
if (scope.status.buddyPicture) { this.updateBuddyPicture(scope.status);
scope.status.buddyPicture = this.updateBuddyPicture(scope.status.buddyPicture);
}
var displayName = scope.displayName; var displayName = scope.displayName;
if (scope.status.displayName) { if (scope.status.displayName) {
scope.displayName = scope.status.displayName; scope.displayName = scope.status.displayName;
@ -371,9 +371,7 @@ define(['underscore', 'modernizr', 'avltree', 'text!partials/buddy.html', 'text!
} else { } else {
scope.status = user.Status; scope.status = user.Status;
scope.displayName = scope.status.displayName; scope.displayName = scope.status.displayName;
if (scope.status.buddyPicture) { this.updateBuddyPicture(scope.status);
scope.status.buddyPicture = this.updateBuddyPicture(scope.status.buddyPicture);
}
} }
} }
//console.log("Joined scope", scope, scope.element); //console.log("Joined scope", scope, scope.element);

4
static/partials/buddy.html

@ -1,5 +1,5 @@
<div class="buddy withSubline" ng-click="doDefault(user.Id)"> <div class="buddy withSubline" ng-click="doDefault(user.Id)">
<div class="buddyimage"><i class="fa fa-user fa-3x"/><img ng-show="status.buddyPicture" alt="" ng-src="{{status.buddyPicture}}"/></div> <div class="buddyimage"><i class="fa fa-user fa-3x"/><img ng-show="status.buddyPicture" alt="" ng-src="{{status.buddyPicture}}" width="{{status.buddyPictureWidth}}" height="{{status.buddyPictureHeight}}"/></div>
<div class="buddy1">{{user.Id|displayName}}</div> <div class="buddy1">{{user.Id|displayName}}</div>
<div class="buddy2">{{user.Ua}}</div> <div class="buddy2">{{user.Ua}}</div>
</div> </div>

Loading…
Cancel
Save