Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved generation of avatar (removed double classes).

Browse source
This commit is contained in:
Martin Edenhofer 2015-02-08 14:18:13 +01:00
parent 7ade40308d
commit 0cb3055441
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/app/models/user.js.coffee
View file

@ -52,23 +52,20 @@ class App.User extends App.Model
else else
return '??' return '??'
avatar: (size = 40, placement = '', cssClass = '') -> avatar: (size = 40, placement = '', cssClass = '', unique = false, avatar) ->
cssClass += " size-#{ size }" cssClass += " size-#{size}"
if placement if placement
placement = "data-placement=\"#{placement}\"" placement = "data-placement=\"#{placement}\""
if !@image || @image is 'none' if !@image || @image is 'none' || unique
return @uniqueAvatar(size, placement, cssClass) return @uniqueAvatar(size, placement, cssClass, avatar)
else else
if @vip if @vip
cssClass += "#{cssClass} vip" cssClass += " vip"
"<span class=\"avatar user-popover #{cssClass}\" data-id=\"#{@id}\" style=\"background-image: url(#{ @imageUrl })\" #{placement}></span>" "<span class=\"avatar user-popover #{cssClass}\" data-id=\"#{@id}\" style=\"background-image: url(#{ @imageUrl })\" #{placement}></span>"
uniqueAvatar: (size = 40, placement = '', cssClass = '', avatar) -> uniqueAvatar: (size, placement = '', cssClass = '', avatar) ->
if size
cssClass += " size-#{ size }"
width = 300 width = 300
height = 226 height = 226
size = parseInt(size, 10) size = parseInt(size, 10)
@ -78,13 +75,13 @@ class App.User extends App.Model
y = rng() * (height - size) y = rng() * (height - size)
if !avatar if !avatar
cssClass += "#{cssClass} user-popover" cssClass += " user-popover"
data = "data-id=\"#{@id}\"" data = "data-id=\"#{@id}\""
else else
data = "data-avatar-id=\"#{avatar.id}\"" data = "data-avatar-id=\"#{avatar.id}\""
if @vip if @vip
cssClass += "#{cssClass} vip" cssClass += " vip"
"<span class=\"avatar unique #{cssClass}\" #{data} style=\"background-position: -#{ x }px -#{ y }px;\" #{placement}>#{ @initials() }</span>" "<span class=\"avatar unique #{cssClass}\" #{data} style=\"background-position: -#{ x }px -#{ y }px;\" #{placement}>#{ @initials() }</span>"
@_fillUp: (data) -> @_fillUp: (data) ->

2
app/assets/javascripts/app/views/profile/avatar.jst.eco
View file

@ -17,7 +17,7 @@
<% if avatar.default: %> <% if avatar.default: %>
<% cssClass = 'is-active' %> <% cssClass = 'is-active' %>
<% end %> <% end %>
<%- App.Session.get().uniqueAvatar('50', '', cssClass, avatar) %> <%- App.Session.get().avatar('50', '', cssClass, true, avatar) %>
<% else: %> <% else: %>
<span class="avatar size-50 <% if avatar.default: %>is-active<% end %>" data-avatar-id="<%- avatar.id %>" style="background-image: url(<%- avatar.content %>)"></span> <span class="avatar size-50 <% if avatar.default: %>is-active<% end %>" data-avatar-id="<%- avatar.id %>" style="background-image: url(<%- avatar.content %>)"></span>
<% if avatar.deletable: %> <% if avatar.deletable: %>