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

fix highlighter: add checkmark to active color

Browse source
This commit is contained in:
Felix Niklas 2015-06-24 17:53:01 +02:00
parent ebedae537c
commit a4c6299179
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/app/controllers/ticket_zoom/higlighter.js.coffee
View file

@ -162,9 +162,8 @@ class App.TicketZoomHighlighter extends App.Controller
#@articles.attr('data-highlightcolor', @colors[@activeColorIndex].name) #@articles.attr('data-highlightcolor', @colors[@activeColorIndex].name)
pickColor: (e) => pickColor: (e) =>
# TODO: @mrflix - still needed? @$('.js-highlightColor .visibility-change.is-active').removeClass('is-active')
#@$('.js-highlightColor .visibility-change.active').removeClass('active') $(e.currentTarget).find('.visibility-change').addClass('is-active')
#$(e.currentTarget).find('.visibility-change').addClass('active')
@activeColorIndex = $(e.currentTarget).attr('data-key') @activeColorIndex = $(e.currentTarget).attr('data-key')
@setColor() @setColor()

4
app/assets/javascripts/app/views/ticket_zoom/highlighter.jst.eco
View file

@ -13,8 +13,8 @@
<span class="color-swatch icon" style="background: <%= entry.color %>"></span> <span class="color-swatch icon" style="background: <%= entry.color %>"></span>
</span> </span>
<%- @Ti(entry.name) %> <%- @Ti(entry.name) %>
<span class="dropdown-activeSpacer visibility-change<%= ' active' if i is @activeColorIndex %>"> <span class="dropdown-activeSpacer visibility-change<%= ' is-active' if i is @activeColorIndex %>">
<span class="white checkmark icon" data-visible="active"></span> <svg class="icon-checkmark" data-visible="active"><use xlink:href="#icon-checkmark" fill="white" /></svg>
</span> </span>
</a> </a>
<% end %> <% end %>