From 377910ce2087f1864c962c187d707c31a4e394d5 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 12 Nov 2015 15:20:07 +0100 Subject: [PATCH 1/2] chat: fix merge problem --- public/assets/chat/chat.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/assets/chat/chat.coffee b/public/assets/chat/chat.coffee index 8171d2e34..cb2c68315 100644 --- a/public/assets/chat/chat.coffee +++ b/public/assets/chat/chat.coffee @@ -315,8 +315,8 @@ do($ = window.jQuery, window) -> # show queue position show() - onQueue: (position) => - @log 'notice', 'onQueue', position + onQueue: (data) => + @log 'notice', 'onQueue', data.position @inQueue = true @setSessionId data.session_id From 45adb0a43d0f3b49653b464e69c3d6af2658ae9c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 12 Nov 2015 15:21:04 +0100 Subject: [PATCH 2/2] chat: fix merge #2 --- public/assets/chat/chat.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/chat/chat.coffee b/public/assets/chat/chat.coffee index cb2c68315..4975aceef 100644 --- a/public/assets/chat/chat.coffee +++ b/public/assets/chat/chat.coffee @@ -303,7 +303,7 @@ do($ = window.jQuery, window) -> # delay initial queue position, show connecting first show = => - @onQueue data.position + @onQueue data if @initialQueueDelay && !@onInitialQueueDelayId @onInitialQueueDelayId = setTimeout(show, @initialQueueDelay) return