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

Fixed naming issue.

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-15 22:38:31 +02:00
parent 333e8fb415
commit 064f81b9cd
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -562,7 +562,6 @@ class App.ControllerModal extends App.Controller
buttonClass: 'btn--success' buttonClass: 'btn--success'
centerButtons: [] centerButtons: []
container: null container: null
onComplete: (->)
options = _.extend( defaults, options ) options = _.extend( defaults, options )
@ -601,7 +600,7 @@ class App.ControllerModal extends App.Controller
container: @container container: @container
.on .on
'show.bs.modal': @onShow 'show.bs.modal': @onShow
'shown.bs.modal': @onComplete 'shown.bs.modal': @onShown
'hidden.bs.modal': => 'hidden.bs.modal': =>
@onHide() @onHide()
# remove modal from dom # remove modal from dom
@ -613,7 +612,6 @@ class App.ControllerModal extends App.Controller
@el.modal('hide') @el.modal('hide')
onShown: => onShown: =>
@onComplete()
console.log('modal shown: do nothing') console.log('modal shown: do nothing')
# do nothing # do nothing

2
app/assets/javascripts/app/controllers/_channel/email.js.coffee
View file

@ -828,7 +828,7 @@ class App.ChannelEmailNotificationWizard extends App.Wizard
container: @container container: @container
.on .on
'show.bs.modal': @onShow 'show.bs.modal': @onShow
'shown.bs.modal': @onComplete 'shown.bs.modal': @onShown
'hidden.bs.modal': => 'hidden.bs.modal': =>
if @callback if @callback
@callback() @callback()

2
app/assets/javascripts/app/controllers/calendar.js.coffee
View file

@ -89,7 +89,7 @@ class Index extends App.ControllerContent
shown: true shown: true
cancel: true cancel: true
container: @el.closest('.content') container: @el.closest('.content')
onComplete: => onShown: =>
businessHours = new App.BusinessHours businessHours = new App.BusinessHours
hours: @hours hours: @hours

2
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -1329,7 +1329,7 @@ class slaRef extends App.ControllerContent
shown: true shown: true
cancel: true cancel: true
container: @el container: @el
onComplete: => onShown: =>
@$('.js-responseTime').timepicker @$('.js-responseTime').timepicker
maxHours: 99 maxHours: 99
@$('.js-time').timepicker @$('.js-time').timepicker