diff options
| author | speasley <s@stephenpeasley.com> | 2016-07-04 20:03:48 -0600 |
|---|---|---|
| committer | speasley <s@stephenpeasley.com> | 2016-07-04 20:03:48 -0600 |
| commit | 1bf1d0a14d94ab6e7cb1f103f554cd51d3f53325 (patch) | |
| tree | 540b1a56eb9fe49f0442e5ef3de38f0bd5ca6461 /app/assets/javascripts | |
| parent | 2c30dd01963a9ead452b85d35546dda0e5fbba99 (diff) | |
Upgrade to Foundation 6
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/application.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/models/startup.js.coffee | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index af36e20..8857e10 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -17,6 +17,7 @@ //= require jquery.turbolinks //= require jquery_ujs //= require foundation +//= require modernizr //= require ractive //= require backbone //= require ractive-backbone @@ -28,3 +29,5 @@ var Stronglifters = Stronglifters || {}; $(function(){ new Stronglifters.Startup().start(); }); + +$(function(){ $(document).foundation(); }); diff --git a/app/assets/javascripts/models/startup.js.coffee b/app/assets/javascripts/models/startup.js.coffee index 88b1e1d..315b337 100644 --- a/app/assets/javascripts/models/startup.js.coffee +++ b/app/assets/javascripts/models/startup.js.coffee @@ -6,5 +6,4 @@ class Stronglifters.Startup $(".loading-indicator").show() $(document).on 'page:change', -> $(".loading-indicator").hide() - Foundation.global.namespace = '' $(document).foundation() |