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

customer chat: fix conflict

Browse source
This commit is contained in:
Felix Niklas 2016-03-22 16:13:51 +01:00
parent f0ebc5ac54
commit b318777201
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/app/controllers/chat.coffee
View file

@ -6,7 +6,7 @@ class App.CustomerChat extends App.Controller
'click .js-settings': 'settings' 'click .js-settings': 'settings'
elements: elements:
'.js-acceptChat': 'acceptChat' '.js-acceptChat': 'acceptChatElement'
'.js-badgeWaitingCustomers': 'badgeWaitingCustomers' '.js-badgeWaitingCustomers': 'badgeWaitingCustomers'
'.js-badgeChattingCustomers': 'badgeChattingCustomers' '.js-badgeChattingCustomers': 'badgeChattingCustomers'
'.js-badgeActiveAgents': 'badgeActiveAgents' '.js-badgeActiveAgents': 'badgeActiveAgents'
@ -244,10 +244,10 @@ class App.CustomerChat extends App.Controller
updateMeta: => updateMeta: =>
if @meta.waiting_chat_count && @maxChatWindows > @windowCount() if @meta.waiting_chat_count && @maxChatWindows > @windowCount()
@acceptChat.addClass('is-clickable is-blinking') @acceptChatElement.addClass('is-clickable is-blinking')
@idleTimeoutStart() @idleTimeoutStart()
else else
@acceptChat.removeClass('is-clickable is-blinking') @acceptChatElement.removeClass('is-clickable is-blinking')
@idleTimeoutStop() @idleTimeoutStop()
@badgeWaitingCustomers.text(@meta.waiting_chat_count) @badgeWaitingCustomers.text(@meta.waiting_chat_count)