Commit 32d0750

mo khan <mo@mokhan.ca>
2016-07-05 02:29:35
update turbolinks events.
1 parent b559637
Changed files (5)
app/assets/javascripts/models/startup.js.coffee
@@ -2,9 +2,9 @@ class Stronglifters.Startup
   start: ->
     Ractive.DEBUG = false
     new Clipboard('.clipboard-button')
-    $(document).on 'page:fetch', ->
+    $(document).on 'turbolinks:request-start', ->
       $(".loading-indicator").show()
-    $(document).on 'page:change', ->
+    $(document).on 'turbolinks:request-end', ->
       $(".loading-indicator").hide()
     Foundation.global.namespace = ''
     $(document).foundation()
app/views/gyms/show.html.erb
@@ -32,5 +32,5 @@
     });
   }
   google.maps.event.addDomListener(window, 'load', initialize);
-  google.maps.event.addDomListener(document, 'page:load', initialize);
+  google.maps.event.addDomListener(document, 'turbolinks:load', initialize);
 </script>
app/views/workouts/new.html.erb
@@ -48,5 +48,5 @@ var ready = function() {
   window.currentView = new Stronglifters.NewWorkoutView({ el: $('#new_workout') });
 };
 $(document).ready(ready);
-$(document).on('page:load', ready);
+$(document).on('turbolinks:load', ready);
 </script>
Gemfile
@@ -40,7 +40,7 @@ source "https://rubygems.org" do
   gem "meta_request", group: :development
   gem "pg"
   gem "poltergeist", group: :test
-  gem "puma", '~> 3.0'
+  gem "puma", "~> 3.0"
   gem "rack-mini-profiler", group: :development
   gem "rack-timeout"
   gem "rack_session_access", group: :test
@@ -62,11 +62,11 @@ source "https://rubygems.org" do
   gem "spring-commands-rspec", group: :test
   gem "spring-commands-teaspoon", group: :test
   gem "spring-watcher-listen", "~> 2.0.0"
-  gem "sprockets-rails", "2.3.3"
+  gem "sprockets-rails", require: "sprockets/railtie"
   gem "stackprof", group: :development
   gem "teaspoon-jasmine", group: :test
   gem "therubyracer", platforms: :ruby
-  gem "turbolinks", '~> 5'
+  gem "turbolinks", "~> 5"
   gem "uglifier", ">= 1.3.0"
   gem "vcr", group: :test
   gem "web-console", group: :development
Gemfile.lock
@@ -272,7 +272,7 @@ GEM
       rails-assets-underscore (>= 1.8.3)
     rails-assets-clipboard (1.5.12)
     rails-assets-lodash (4.13.1)
-    rails-assets-moment (2.13.0)
+    rails-assets-moment (2.14.1)
     rails-assets-ractive (0.7.3)
     rails-assets-ractive-backbone (0.3.0)
     rails-assets-underscore (1.8.3)
@@ -368,10 +368,10 @@ GEM
     sprockets (3.6.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
+    sprockets-rails (3.1.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
     sshkit (1.11.1)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
@@ -496,7 +496,7 @@ DEPENDENCIES
   spring-commands-rspec!
   spring-commands-teaspoon!
   spring-watcher-listen (~> 2.0.0)!
-  sprockets-rails (= 2.3.3)!
+  sprockets-rails!
   stackprof!
   teaspoon-jasmine!
   therubyracer!