(html) Fix generic avatar in lists

Fixes #3719
pull/213/head
Francis Lachapelle 2016-06-08 14:02:45 -04:00
parent 44d184b1cf
commit 076b6b6ad5
3 changed files with 14 additions and 8 deletions

6
NEWS
View File

@ -1,3 +1,9 @@
3.1.3 (2016-MM-DD)
------------------
Bug fixes
- [web] fixed generic avatar in lists (#3719)
3.1.2 (2016-06-06)
------------------

View File

@ -410,11 +410,11 @@
<!-- ng-if="currentCard.selected"> -->
<!-- selected avatar -->
<!-- </div> -->
<sg-avatar-image class="md-avatar"
ng-if="currentCard.$isCard()"
sg-email="currentCard.$preferredEmail(addressbook.selectedFolder.constructor.$query.value)"
sg-src="currentCard.photoURL"
size="40">
<sg-avatar-image
ng-if="currentCard.$isCard()"
sg-email="currentCard.$preferredEmail(addressbook.selectedFolder.constructor.$query.value)"
sg-src="currentCard.photoURL"
size="40">
<!-- contact avatar -->
</sg-avatar-image>
<div class="md-avatar sg-avatar-list"

View File

@ -272,9 +272,9 @@
label:aria-label="Select Message"
ng-class="{ 'sg-avatar-selected': currentMessage.selected }"
ng-click="mailbox.toggleMessageSelection($event, currentMessage)">
<sg-avatar-image class="md-avatar"
sg-email="mailbox.service.selectedFolder.type == 'sent' ? currentMessage.to[0].email : currentMessage.from[0].email"
size="40"><!-- avatar --></sg-avatar-image>
<sg-avatar-image
sg-email="mailbox.service.selectedFolder.type == 'sent' ? currentMessage.to[0].email : currentMessage.from[0].email"
size="40"><!-- avatar --></sg-avatar-image>
</div>
<div class="sg-category"
ng-repeat="tag in currentMessage.flags | limitTo:5"