Merge pull request #756 from fnix/turbolinks5

Adds turbolinks 5 events
comfy · Apr 12, 2017 · cb2b0e2 · cb2b0e2
2 parents 7271c80 + a4a9e64
commit cb2b0e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/comfy/admin/cms/base.js.coffee b/app/assets/javascripts/comfy/admin/cms/base.js.coffee
@@ -3,7 +3,7 @@ window.CMS ||= {}
 window.CMS.code_mirror_instances = [ ]
 
 $ -> window.CMS.init()
-$(document).on 'page:load', -> window.CMS.init()
+$(document).on 'page:load turbolinks:load', -> window.CMS.init()
 
 window.CMS.init = ->
   window.CMS.current_path = window.location.pathname

diff --git a/app/assets/javascripts/comfy/admin/cms/lib/diff.js.coffee b/app/assets/javascripts/comfy/admin/cms/lib/diff.js.coffee
@@ -1,7 +1,7 @@
 #= require comfy/admin/cms/lib/diff/diff_match_patch.min
 #= require comfy/admin/cms/lib/diff/pretty_text_diff.min
 
-$(document).on 'page:load ready', ->
+$(document).on 'page:load ready turbolinks:load', ->
   $("table.diff").prettyTextDiff ->
     cleanup: true
     originalContainer:  'tr td.original'