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

Fixed issue #2823 - Unable to open notifications (if chat is enabled).

Browse source
This commit is contained in:
Martin Edenhofer 2019-12-03 12:49:41 +01:00
parent 1340d26501
commit 209951b19b
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,7 @@ class App.CustomerChat extends App.Controller
constructor: -> constructor: ->
super super
@popovers = []
@chatWindows = {} @chatWindows = {}
@maxChatWindows = 4 @maxChatWindows = 4
preferences = @Session.get('preferences') preferences = @Session.get('preferences')
@ -221,7 +222,12 @@ class App.CustomerChat extends App.Controller
chats chats
updateMeta: => updateMeta: =>
$('.popover').remove()
# clear old popovers
for popover in @popovers
popover.popover('destroy')
@popovers = []
activeChatTopcis = @activeChatTopcis() activeChatTopcis = @activeChatTopcis()
@$('.js-header').html(App.view('customer_chat/chat_header')(chats: activeChatTopcis)) @$('.js-header').html(App.view('customer_chat/chat_header')(chats: activeChatTopcis))
@refreshElements() @refreshElements()
@ -244,7 +250,7 @@ class App.CustomerChat extends App.Controller
for chat in App.Chat.all() for chat in App.Chat.all()
do (chat) => do (chat) =>
@$(".js-header .js-waitingCustomers[data-chat-id=#{chat.id}] .js-badgeWaitingCustomers").text(@meta.waiting_chat_count_by_chat[chat.id]) @$(".js-header .js-waitingCustomers[data-chat-id=#{chat.id}] .js-badgeWaitingCustomers").text(@meta.waiting_chat_count_by_chat[chat.id])
@el.find(".js-waitingCustomers[data-chat-id=#{chat.id}] .js-info").popover( @popovers.push @el.find(".js-waitingCustomers[data-chat-id=#{chat.id}] .js-info").popover(
trigger: 'hover' trigger: 'hover'
html: true html: true
animation: false animation: false
@ -258,7 +264,7 @@ class App.CustomerChat extends App.Controller
) )
else else
@badgeWaitingCustomers.text(@meta.waiting_chat_count) @badgeWaitingCustomers.text(@meta.waiting_chat_count)
@el.find('.js-waitingCustomers .js-totalInfo').popover( @popovers.push @el.find('.js-waitingCustomers .js-totalInfo').popover(
trigger: 'hover' trigger: 'hover'
html: true html: true
animation: false animation: false
@ -280,7 +286,7 @@ class App.CustomerChat extends App.Controller
@addChat(session) @addChat(session)
@meta.active_sessions = false @meta.active_sessions = false
@el.find('.js-chattingCustomers .js-info').popover( @popovers.push @el.find('.js-chattingCustomers .js-info').popover(
trigger: 'hover' trigger: 'hover'
html: true html: true
animation: false animation: false
@ -293,7 +299,7 @@ class App.CustomerChat extends App.Controller
@chatSessionList(@meta.running_chat_session_list) @chatSessionList(@meta.running_chat_session_list)
) )
@el.find('.js-activeAgents .js-info').popover( @popovers.push @el.find('.js-activeAgents .js-info').popover(
trigger: 'hover' trigger: 'hover'
html: true html: true
animation: false animation: false