init.coffee in rails_script-2.0.1

- old
+ new

@@ -1,24 +1,27 @@
 window.RailsScript ||= {}
 window.App ||= {}
 window.Element ||= {}
 window.Utility ||= {}
 
-$(document).on "turbolinks:load.rails_script",  ->
+# Initializer
+$(document).on "ready.rails_script page:load.rails_script turbolinks:load.rails_script",  ->
+  controller = $('#rails-script').data('controller')
+  action = $('#rails-script').data('action')
   Utility.RailsVars = $('#rails-script').data('vars')
-  window.$this = new (App["#{$('#rails-script').data('controller')}"] || App.Base)()
 
-  action = $('#rails-script').data('action')
+  window.$this = new (App[controller] || App.Base)()
 
   if typeof $this.beforeAction == 'function'
     $this.beforeAction action
   if typeof $this[action] == 'function'
     $this[action]()
   if typeof $this.afterAction == 'function'
     $this.afterAction action
 
+# Clear event handlers on navigation
 RailsScript.setClearEventHandlers = ->
-  jQuery(document).on 'turbolinks:before-visit', ->
+  jQuery(document).on 'page:before-change turbolinks:before-visit', ->
     for element in [window, document]
       for event, handlers of (jQuery._data(element, 'events') || {})
         for handler in handlers
           if handler? && handler.namespace == ''
             jQuery(element).off event, handler.handler
\ No newline at end of file