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

activate highlighter on pickColor

Browse source
This commit is contained in:
Felix Niklas 2015-06-08 12:36:11 +02:00
parent 10a87d72a1
commit 12ea7db7d0
1 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -872,11 +872,17 @@ class highlightRef extends App.ControllerContent
toggleHighlight: (e) => toggleHighlight: (e) =>
if @isActive if @isActive
@deactivate()
else
@activate()
deactivate: ->
@highlightIcon.css('fill', '') @highlightIcon.css('fill', '')
@isActive = false @isActive = false
@articles.off('mouseup', @onMouseUp) @articles.off('mouseup', @onMouseUp)
@articles.removeAttr('data-highlightcolor') @articles.removeAttr('data-highlightcolor')
else
activate: ->
selection = rangy.getSelection() selection = rangy.getSelection()
# if there's already something selected, # if there's already something selected,
# don't go into highlight mode # don't go into highlight mode
@ -898,7 +904,9 @@ class highlightRef extends App.ControllerContent
$(e.currentTarget).find('.visibility-change').addClass('is-active') $(e.currentTarget).find('.visibility-change').addClass('is-active')
@activeColorIndex = $(e.currentTarget).attr('data-key') @activeColorIndex = $(e.currentTarget).attr('data-key')
if @isActive if not @isActive
@activate()
else
@highlightIcon.css('fill', @colors[@activeColorIndex].color) @highlightIcon.css('fill', @colors[@activeColorIndex].color)
@setColor() @setColor()