From bca84d7968c2690f7ca83bdb7c26352abbdb5af9 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 11 Nov 2015 11:24:19 +0100 Subject: [PATCH] Small code cleanup. --- public/assets/chat/chat.coffee | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/assets/chat/chat.coffee b/public/assets/chat/chat.coffee index 2a5e11ba8..950ed6e01 100644 --- a/public/assets/chat/chat.coffee +++ b/public/assets/chat/chat.coffee @@ -63,7 +63,8 @@ do($ = window.jQuery, window) -> @ws.onopen = => console.log('ws connected') - @send 'chat_status' + @send 'chat_status_customer' + @ws.onmessage = @onWebSocketMessage @@ -97,11 +98,6 @@ do($ = window.jQuery, window) -> when 'chat_session_typing' return if pipe.data.self_written @onAgentTypingStart() - if @stopTypingId - clearTimeout(@stopTypingId) - delay = => - @onAgentTypingEnd() - @stopTypingId = setTimeout(delay, 3000) when 'chat_session_start' switch pipe.data.state when 'ok' @@ -113,7 +109,7 @@ do($ = window.jQuery, window) -> when 'queue' @onQueue pipe.data.position @session_id = pipe.data.session_id - when 'chat_status' + when 'chat_status_customer' switch pipe.data.state when 'online' @onReady() @@ -170,7 +166,7 @@ do($ = window.jQuery, window) -> # add message before message typing loader if @el.find('.zammad-chat-message--typing').size() @lastAddedType = 'typing-placeholder' - @el.find('.zammad-chat-message--typing').before messageElement + @el.find('.zammad-chat-message--typing').before messageElement else @lastAddedType = 'message--customer' @el.find('.zammad-chat-body').append messageElement @@ -245,6 +241,10 @@ do($ = window.jQuery, window) -> position: position onAgentTypingStart: => + if @stopTypingId + clearTimeout(@stopTypingId) + @stopTypingId = setTimeout(@onAgentTypingEnd, 3000) + # never display two typing indicators return if @el.find('.zammad-chat-message--typing').size()