From b3187772015019b6c61c39818798c7eee62fba08 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 22 Mar 2016 16:13:51 +0100 Subject: [PATCH] customer chat: fix conflict --- app/assets/javascripts/app/controllers/chat.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee index dbfed2892..f172e3aad 100644 --- a/app/assets/javascripts/app/controllers/chat.coffee +++ b/app/assets/javascripts/app/controllers/chat.coffee @@ -6,7 +6,7 @@ class App.CustomerChat extends App.Controller 'click .js-settings': 'settings' elements: - '.js-acceptChat': 'acceptChat' + '.js-acceptChat': 'acceptChatElement' '.js-badgeWaitingCustomers': 'badgeWaitingCustomers' '.js-badgeChattingCustomers': 'badgeChattingCustomers' '.js-badgeActiveAgents': 'badgeActiveAgents' @@ -244,10 +244,10 @@ class App.CustomerChat extends App.Controller updateMeta: => if @meta.waiting_chat_count && @maxChatWindows > @windowCount() - @acceptChat.addClass('is-clickable is-blinking') + @acceptChatElement.addClass('is-clickable is-blinking') @idleTimeoutStart() else - @acceptChat.removeClass('is-clickable is-blinking') + @acceptChatElement.removeClass('is-clickable is-blinking') @idleTimeoutStop() @badgeWaitingCustomers.text(@meta.waiting_chat_count)