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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-11-12 15:21:59 +01:00
commit c71e052548
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public/assets/chat/chat.coffee
View file

@ -303,7 +303,7 @@ do($ = window.jQuery, window) ->
# delay initial queue position, show connecting first # delay initial queue position, show connecting first
show = => show = =>
@onQueue data.position @onQueue data
if @initialQueueDelay && !@onInitialQueueDelayId if @initialQueueDelay && !@onInitialQueueDelayId
@onInitialQueueDelayId = setTimeout(show, @initialQueueDelay) @onInitialQueueDelayId = setTimeout(show, @initialQueueDelay)
return return
@ -315,8 +315,8 @@ do($ = window.jQuery, window) ->
# show queue position # show queue position
show() show()
onQueue: (position) => onQueue: (data) =>
@log 'notice', 'onQueue', position @log 'notice', 'onQueue', data.position
@inQueue = true @inQueue = true
@setSessionId data.session_id @setSessionId data.session_id