diff --git a/app/assets/javascripts/app/controllers/_channel/chat.coffee b/app/assets/javascripts/app/controllers/_channel/chat.coffee index e24caaa72..15c5d13c0 100644 --- a/app/assets/javascripts/app/controllers/_channel/chat.coffee +++ b/app/assets/javascripts/app/controllers/_channel/chat.coffee @@ -24,7 +24,7 @@ class App.ChannelChat extends App.Controller '.js-code': 'code' '.js-palette': 'palette' '.js-color': 'colorField' - '.js-chatSetting': 'chatSetting' + '.js-chatSetting input': 'chatSetting' apiOptions: [ { @@ -279,6 +279,8 @@ class App.ChannelChat extends App.Controller setting.state_current = { value: value } setting.save() @Config.set('chat', value) + delay = -> App.Event.trigger('ui:rerender') + @delay(delay, 200) updateParams: => quote = (value) -> diff --git a/app/assets/javascripts/app/controllers/_channel/form.coffee b/app/assets/javascripts/app/controllers/_channel/form.coffee index cc15bff7c..ba587fe0c 100644 --- a/app/assets/javascripts/app/controllers/_channel/form.coffee +++ b/app/assets/javascripts/app/controllers/_channel/form.coffee @@ -7,7 +7,7 @@ class App.ChannelForm extends App.Controller elements: '.js-paramsBlock': 'paramsBlock' - '.js-formSetting': 'formSetting' + '.js-formSetting input': 'formSetting' constructor: -> super diff --git a/app/assets/javascripts/app/controllers/chat.coffee b/app/assets/javascripts/app/controllers/chat.coffee index da34f17da..3815e9825 100644 --- a/app/assets/javascripts/app/controllers/chat.coffee +++ b/app/assets/javascripts/app/controllers/chat.coffee @@ -11,14 +11,6 @@ class App.CustomerChat extends App.Controller constructor: -> super - # access check - if !@isRole('Chat') - @renderScreenUnauthorized(objectName: 'Chat') - return - if !@Config.get('chat') - @renderScreenError(detail: 'Feature disabled!') - return - @chatWindows = {} @maxChatWindows = 4 preferences = @Session.get('preferences') @@ -49,7 +41,6 @@ class App.CustomerChat extends App.Controller # add new chat window @bind('chat_session_start', (data) => - console.log('chat_session_start', data) if data.session @addChat(data.session) ) @@ -78,6 +69,13 @@ class App.CustomerChat extends App.Controller ) render: -> + if !@isRole('Chat') + @renderScreenUnauthorized(objectName: 'Chat') + return + if !@Config.get('chat') + @renderScreenError(detail: 'Feature disabled!') + return + @html App.view('customer_chat/index')() show: (params) => diff --git a/app/assets/javascripts/app/controllers/navigation.coffee b/app/assets/javascripts/app/controllers/navigation.coffee index 27184e1ff..4003f1045 100644 --- a/app/assets/javascripts/app/controllers/navigation.coffee +++ b/app/assets/javascripts/app/controllers/navigation.coffee @@ -82,7 +82,7 @@ class App.Navigation extends App.ControllerWidgetPermanent ) # bind on switch changes and execute it on controller - @$('.js-menu .js-switch').bind('change', (e) -> + @$('.js-menu .js-switch input').bind('change', (e) -> val = $(e.target).prop('checked') key = $(e.target).closest('.menu-item').data('key') return if !key diff --git a/app/assets/javascripts/app/views/channel/chat.jst.eco b/app/assets/javascripts/app/views/channel/chat.jst.eco index c4918513c..865f2fc44 100644 --- a/app/assets/javascripts/app/views/channel/chat.jst.eco +++ b/app/assets/javascripts/app/views/channel/chat.jst.eco @@ -8,8 +8,8 @@