From 064f81b9cd829c34ae72ce4b4713883e82174c56 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 15 Sep 2015 22:38:31 +0200 Subject: [PATCH] Fixed naming issue. --- .../app/controllers/_application_controller.js.coffee | 4 +--- .../javascripts/app/controllers/_channel/email.js.coffee | 2 +- app/assets/javascripts/app/controllers/calendar.js.coffee | 2 +- app/assets/javascripts/app/controllers/layout_ref.js.coffee | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 871f28bcc..315e5a8b7 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -562,7 +562,6 @@ class App.ControllerModal extends App.Controller buttonClass: 'btn--success' centerButtons: [] container: null - onComplete: (->) options = _.extend( defaults, options ) @@ -601,7 +600,7 @@ class App.ControllerModal extends App.Controller container: @container .on 'show.bs.modal': @onShow - 'shown.bs.modal': @onComplete + 'shown.bs.modal': @onShown 'hidden.bs.modal': => @onHide() # remove modal from dom @@ -613,7 +612,6 @@ class App.ControllerModal extends App.Controller @el.modal('hide') onShown: => - @onComplete() console.log('modal shown: do nothing') # do nothing diff --git a/app/assets/javascripts/app/controllers/_channel/email.js.coffee b/app/assets/javascripts/app/controllers/_channel/email.js.coffee index e3a2cf74e..04218aafb 100644 --- a/app/assets/javascripts/app/controllers/_channel/email.js.coffee +++ b/app/assets/javascripts/app/controllers/_channel/email.js.coffee @@ -828,7 +828,7 @@ class App.ChannelEmailNotificationWizard extends App.Wizard container: @container .on 'show.bs.modal': @onShow - 'shown.bs.modal': @onComplete + 'shown.bs.modal': @onShown 'hidden.bs.modal': => if @callback @callback() diff --git a/app/assets/javascripts/app/controllers/calendar.js.coffee b/app/assets/javascripts/app/controllers/calendar.js.coffee index 0ef6e17e0..9dff325ba 100644 --- a/app/assets/javascripts/app/controllers/calendar.js.coffee +++ b/app/assets/javascripts/app/controllers/calendar.js.coffee @@ -89,7 +89,7 @@ class Index extends App.ControllerContent shown: true cancel: true container: @el.closest('.content') - onComplete: => + onShown: => businessHours = new App.BusinessHours hours: @hours diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 597771192..312a974f3 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1329,7 +1329,7 @@ class slaRef extends App.ControllerContent shown: true cancel: true container: @el - onComplete: => + onShown: => @$('.js-responseTime').timepicker maxHours: 99 @$('.js-time').timepicker