Improved d&d batches (sometimes mouseleave is fired if seleced batch is fade out - so no ticket is processed).
This commit is contained in:
parent
a84c65f6c7
commit
a7cf3da7da
1 changed files with 6 additions and 3 deletions
|
@ -108,6 +108,8 @@ class App.TicketOverview extends App.Controller
|
||||||
$(document).off 'mouseup.item'
|
$(document).off 'mouseup.item'
|
||||||
pos = @batchDragger.data()
|
pos = @batchDragger.data()
|
||||||
|
|
||||||
|
@clearDelay('clear-hovered-batch-entry')
|
||||||
|
|
||||||
if !@hoveredBatchEntry
|
if !@hoveredBatchEntry
|
||||||
@cleanUpDrag()
|
@cleanUpDrag()
|
||||||
return
|
return
|
||||||
|
@ -513,6 +515,7 @@ class App.TicketOverview extends App.Controller
|
||||||
@hoveredBatchEntry = entryAtPoint.closest('.js-batch-overlay-entry').addClass('is-hovered')
|
@hoveredBatchEntry = entryAtPoint.closest('.js-batch-overlay-entry').addClass('is-hovered')
|
||||||
|
|
||||||
highlightBatchEntry: (event) ->
|
highlightBatchEntry: (event) ->
|
||||||
|
@clearDelay('clear-hovered-batch-entry')
|
||||||
@hoveredBatchEntry = $(event.currentTarget).closest('.js-batch-overlay-entry').addClass('is-hovered')
|
@hoveredBatchEntry = $(event.currentTarget).closest('.js-batch-overlay-entry').addClass('is-hovered')
|
||||||
|
|
||||||
if @hoveredBatchEntry.attr('data-action') is 'group_assign'
|
if @hoveredBatchEntry.attr('data-action') is 'group_assign'
|
||||||
|
@ -528,7 +531,9 @@ class App.TicketOverview extends App.Controller
|
||||||
clearTimeout @batchAssignGroupHintTimeout
|
clearTimeout @batchAssignGroupHintTimeout
|
||||||
|
|
||||||
@hoveredBatchEntry.removeClass('is-hovered')
|
@hoveredBatchEntry.removeClass('is-hovered')
|
||||||
@hoveredBatchEntry = null
|
delay = =>
|
||||||
|
@hoveredBatchEntry = null
|
||||||
|
@delay(delay, 800, 'clear-hovered-batch-entry')
|
||||||
|
|
||||||
blinkBatchEntry: =>
|
blinkBatchEntry: =>
|
||||||
@hoveredBatchEntry
|
@hoveredBatchEntry
|
||||||
|
@ -953,7 +958,6 @@ class Table extends App.Controller
|
||||||
ticketListShow.push App.Ticket.find(ticket.id)
|
ticketListShow.push App.Ticket.find(ticket.id)
|
||||||
console.log('overview', overview)
|
console.log('overview', overview)
|
||||||
@overview = App.Overview.find(overview.id)
|
@overview = App.Overview.find(overview.id)
|
||||||
console.log('TTT', @overview.view.s)
|
|
||||||
@table.update(
|
@table.update(
|
||||||
overviewAttributes: @overview.view.s
|
overviewAttributes: @overview.view.s
|
||||||
objects: ticketListShow
|
objects: ticketListShow
|
||||||
|
@ -1508,7 +1512,6 @@ class App.OverviewSettings extends App.ControllerModal
|
||||||
App.OverviewListCollection.fetch(@overview.link)
|
App.OverviewListCollection.fetch(@overview.link)
|
||||||
else
|
else
|
||||||
App.OverviewIndexCollection.trigger()
|
App.OverviewIndexCollection.trigger()
|
||||||
console.log('TRIGGER', @overview.link)
|
|
||||||
App.OverviewListCollection.trigger(@overview.link)
|
App.OverviewListCollection.trigger(@overview.link)
|
||||||
|
|
||||||
# close modal
|
# close modal
|
||||||
|
|
Loading…
Reference in a new issue