Skip to content

Commit

Permalink
Batch action hover target
Browse files Browse the repository at this point in the history
- don’t select when hovered over the name, only when hovered over the avatar
- fix hoveredBatchEntry bug
  • Loading branch information
mrflix committed Feb 10, 2017
1 parent 7ac8042 commit e7c0688
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
13 changes: 7 additions & 6 deletions app/assets/javascripts/app/controllers/ticket_overview.coffee
Expand Up @@ -21,8 +21,8 @@ class App.TicketOverview extends App.Controller

events:
'mousedown .item': 'startDragItem'
'mouseenter .js-batch-overlay-entry': 'highlightBatchEntry'
'mouseleave .js-batch-overlay-entry': 'unhighlightBatchEntry'
'mouseenter .js-hover-target': 'highlightBatchEntry'
'mouseleave .js-hover-target': 'unhighlightBatchEntry'

constructor: ->
super
Expand Down Expand Up @@ -492,26 +492,27 @@ class App.TicketOverview extends App.Controller
@batchMacroShown = false

highlightBatchEntryAtMousePosition: =>
entryAtPoint = $(document.elementFromPoint(@mouse.x, @mouse.y)).closest('.js-batch-overlay-entry')
entryAtPoint = $(document.elementFromPoint(@mouse.x, @mouse.y)).closest('.js-batch-overlay-entry .avatar')
if(entryAtPoint.length)
@hoveredBatchEntry = entryAtPoint.addClass('is-hovered')
@hoveredBatchEntry = entryAtPoint.closest('.js-batch-overlay-entry').addClass('is-hovered')

highlightBatchEntry: (event) ->
@hoveredBatchEntry = $(event.currentTarget).addClass('is-hovered')
@hoveredBatchEntry = $(event.currentTarget).closest('.js-batch-overlay-entry').addClass('is-hovered')

if @hoveredBatchEntry.attr('data-action') is 'group_assign'
@batchAssignGroupHintTimeout = setTimeout @blinkBatchEntry, 800
@batchAssignGroupTimeout = setTimeout @showBatchAssignGroup, 900

unhighlightBatchEntry: (event) ->
return if !@hoveredBatchEntry
if @hoveredBatchEntry.attr('data-action') is 'group_assign'
if @batchAssignGroupTimeout
clearTimeout @batchAssignGroupTimeout
if @batchAssignGroupHintTimeout
clearTimeout @batchAssignGroupHintTimeout

@hoveredBatchEntry.removeClass('is-hovered')
@hoveredBatchEntry = null
$(event.currentTarget).removeClass('is-hovered')

blinkBatchEntry: =>
@hoveredBatchEntry
Expand Down
@@ -1,7 +1,9 @@
<div class="batch-overlay-box-inner">
<% for macro in @macros: %>
<div class="batch-overlay-macro-entry js-batch-overlay-entry" data-action="macro" data-id="<%= macro.id %>">
<div class="batch-overlay-macro-entry-name"><%= macro.name %></div>
<div class="js-hover-target">
<div class="batch-overlay-macro-entry-name"><%= macro.name %></div>
</div>
</div>
<% end %>
</div>
@@ -1,12 +1,12 @@
<% for user in @users: %>
<div class="batch-overlay-assign-entry js-batch-overlay-entry" data-action="user_assign" data-id="<%= user.id %>">
<%- user.avatar(80) %>
<div class="js-hover-target"><%- user.avatar(80) %></div>
<div class="batch-overlay-assign-entry-name"><%- user.displayName() %></div>
</div>
<% end %>
<% for group in @groups: %>
<div class="batch-overlay-assign-entry js-batch-overlay-entry" data-action="group_assign" data-id="<%= group.id %>">
<span class="avatar avatar--organization size-80">
<span class="avatar avatar--organization size-80 js-hover-target">
<%- @Icon('organization') %>
</span>
<div class="batch-overlay-assign-entry-name"><%- group.displayName() %></div>
Expand Down

0 comments on commit e7c0688

Please sign in to comment.