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

highlighter: dont select when selection started outside of article

Browse source
This commit is contained in:
Felix Niklas 2015-10-02 18:00:59 +02:00
parent 87d353a795
commit 04794fd905
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/assets/javascripts/app/controllers/layout_ref.coffee
View file

@ -895,7 +895,7 @@ class TicketZoomRef extends App.ControllerContent
# don't go into highlight mode # don't go into highlight mode
# just toggle the selected # just toggle the selected
if !selection.isCollapsed if !selection.isCollapsed
@toggleHighlightAtSelection $(selection.anchorNode).closest @articles.selector @toggleHighlightAtSelection selection, $(selection.anchorNode).closest @articles.selector
else else
# show color # show color
@highlightIcon.css('fill', @colors[@activeColorIndex].color) @highlightIcon.css('fill', @colors[@activeColorIndex].color)
@ -919,7 +919,9 @@ class TicketZoomRef extends App.ControllerContent
@setColor() @setColor()
onMouseUp: (e) => onMouseUp: (e) =>
@toggleHighlightAtSelection $(e.currentTarget).closest @articles.selector selection = rangy.getSelection()
@toggleHighlightAtSelection selection, $(e.currentTarget).closest @articles.selector
# #
# toggle Highlight # toggle Highlight
@ -930,12 +932,21 @@ class TicketZoomRef extends App.ControllerContent
# - or highlights the selection # - or highlights the selection
# - clears the selection # - clears the selection
toggleHighlightAtSelection: (article) -> toggleHighlightAtSelection: (selection, article) ->
selection = rangy.getSelection()
if @highlighter.selectionOverlapsHighlight selection if @highlighter.selectionOverlapsHighlight selection
@highlighter.unhighlightSelection() @highlighter.unhighlightSelection()
else return @storeHighlights()
# selection.anchorNode = element in which the selection started
# selection.focusNode = element in which the selection ended
#
# check if the start node is inside of the article or the article itself
startNode = @$(selection.anchorNode)
if !(article.is(startNode) or article.contents().is(startNode))
return selection.removeAllRanges()
@highlighter.highlightSelection @highlightClass, @highlighter.highlightSelection @highlightClass,
selection: selection selection: selection
containerElementId: article.get(0).id containerElementId: article.get(0).id