taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Set username as title/alt for avatar images

stable
Daniel García 2018-08-14 12:20:03 +02:00 committed by Alex Hermida
parent d1bd29520d
commit 0d90eaed55
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/modules/components/avatar/avatar.directive.coffee
View File

@ -28,13 +28,15 @@ AvatarDirective = (avatarService) ->
avatar = avatarService.getAvatar(user, attributeName) avatar = avatarService.getAvatar(user, attributeName)
el.attr('src', avatar.url) el.attr('src', avatar.url)
el.attr('title', "#{avatar.username}")
el.attr('alt', "#{avatar.username}")
el.css('background', avatar.bg or "") el.css('background', avatar.bg or "")
return { return {
link: link link: link
scope: { scope: {
avatar: "=tgAvatar" avatar: "=tgAvatar"
avatarBig: "=tgAvatarBig" avatarBig: "=tgAvatarBig"
} }
} }

9
app/modules/services/avatar.service.coffee
View File

@ -46,6 +46,7 @@ class AvatarService
getUnnamed: () -> getUnnamed: () ->
return { return {
url: "/#{window._version}/images/unnamed.png" url: "/#{window._version}/images/unnamed.png"
username: ''
} }
getAvatar: (user, type) -> getAvatar: (user, type) ->
@ -61,9 +62,11 @@ class AvatarService
if user instanceof Immutable.Map if user instanceof Immutable.Map
gravatar = user.get('gravatar_id') gravatar = user.get('gravatar_id')
photo = user.get(avatarParamName) photo = user.get(avatarParamName)
username = "@#{user.get('username')}"
else else
gravatar = user.gravatar_id gravatar = user.gravatar_id
photo = user[avatarParamName] photo = user[avatarParamName]
username = "@#{user.username}"
return @.getUnnamed() if !gravatar return @.getUnnamed() if !gravatar
@ -77,7 +80,8 @@ class AvatarService
return { return {
url: root + logo.src, url: root + logo.src,
bg: logo.color bg: logo.color,
username: username
} }
else else
root = location.protocol + '//' + location.host root = location.protocol + '//' + location.host
@ -87,7 +91,8 @@ class AvatarService
return { return {
url: 'https://www.gravatar.com/avatar/' + gravatar + "?s=200&d=" + logoUrl, url: 'https://www.gravatar.com/avatar/' + gravatar + "?s=200&d=" + logoUrl,
bg: logo.color bg: logo.color,
username: username
} }
angular.module("taigaCommon").service("tgAvatarService", ["$tgConfig", AvatarService]) angular.module("taigaCommon").service("tgAvatarService", ["$tgConfig", AvatarService])