diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee index c515353c5..bf71acf99 100644 --- a/app/assets/javascripts/app/controllers/chat.coffee +++ b/app/assets/javascripts/app/controllers/chat.coffee @@ -60,7 +60,7 @@ class App.CustomerChat extends App.Controller App.WebSocket.send(event:'chat_status_agent') # rerender view, e. g. on langauge change - @bind('ui:rerender', => + @bind('ui:rerender chat:rerender', => return if !@authenticate(true) for session_id, chat of @chatWindows chat.el.remove() diff --git a/app/assets/javascripts/app/models/setting.coffee b/app/assets/javascripts/app/models/setting.coffee index a1af9c003..321d7bccb 100644 --- a/app/assets/javascripts/app/models/setting.coffee +++ b/app/assets/javascripts/app/models/setting.coffee @@ -36,8 +36,12 @@ class App.Setting extends App.Model App.Event.trigger('ui:rerender') if setting.preferences.trigger - trigger = setting.preferences.trigger - delay = -> App.Event.trigger(trigger) + events = setting.preferences.trigger + if !_.isArray(setting.preferences.trigger) + events = [setting.preferences.trigger] + delay = -> + for event in events + App.Event.trigger(event) App.Delay.set(delay, 20) if setting.preferences.session_check diff --git a/db/migrate/20160429000001_update_cti.rb b/db/migrate/20160429000002_update_cti.rb similarity index 80% rename from db/migrate/20160429000001_update_cti.rb rename to db/migrate/20160429000002_update_cti.rb index 9f732f8e3..6f389b723 100644 --- a/db/migrate/20160429000001_update_cti.rb +++ b/db/migrate/20160429000002_update_cti.rb @@ -8,7 +8,7 @@ class UpdateCti < ActiveRecord::Migration setting = Setting.find_by(name: 'chat') if setting - setting.preferences = { trigger: 'menu:render' } + setting.preferences = { trigger: ['menu:render', 'chat:rerender'] } setting.save end end diff --git a/db/seeds.rb b/db/seeds.rb index 764814e53..c4b824775 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1198,7 +1198,7 @@ Setting.create_if_not_exists( }, ], }, - preferences: { trigger: 'menu:render' }, + preferences: { trigger: ['menu:render', 'chat:rerender'] }, state: false, frontend: true )