Updating foundation version

kyan · Nov 12, 2014 · 5140089 · 5140089
1 parent f7f7356
commit 5140089
Show file tree

Hide file tree

Showing 135 changed files with 1,868 additions and 1,023 deletions.
diff --git a/Gemfile b/Gemfile
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Foundation::Rails is a gem to make it super easy to use Foundation in your upcom
 
 Add this line to your application's Gemfile:
 
-    $ gem 'foundation-rails', git: '[email protected]:kyan/foundation-rails-kyan.git'
+    $ gem 'foundation-rails'
 
 And then execute:
 
@@ -81,4 +81,4 @@ Run the generator to add foundation to the asset pipeline:
 
 * [Foundation Docs](http://foundation.zurb.com/docs/)
 * [Foundation Forum](http://foundation.zurb.com/forum)
-* [Foundation Training](http://foundation.zurb.com/learn/training.html)
+* [Foundation Training](http://foundation.zurb.com/learn/training.html)
diff --git a/Rakefile b/Rakefile
diff --git a/app/controllers/foundation/rails/styleguide_controller.rb b/app/controllers/foundation/rails/styleguide_controller.rb
diff --git a/app/views/foundation/rails/styleguide/show.html.erb b/app/views/foundation/rails/styleguide/show.html.erb
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "foundation-rails",
-  "version": "5.3.3.0",
+  "version": "5.4.6.0",
   "dependencies": {
-    "foundation": "5.3.3"
+    "foundation": "5.4.6"
   }
 }
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/foundation-rails.gemspec b/foundation-rails.gemspec
diff --git a/lib/foundation-rails.rb b/lib/foundation-rails.rb
diff --git a/lib/foundation/rails.rb b/lib/foundation/rails.rb
diff --git a/lib/foundation/rails/engine.rb b/lib/foundation/rails/engine.rb
diff --git a/lib/foundation/rails/generators/install_generator.rb b/lib/foundation/rails/generators/install_generator.rb
@@ -14,17 +14,17 @@ def add_assets
           # rails_ujs breaks, need to incorporate rails-behavior plugin for this to work seamlessly
           # gsub_file "app/assets/javascripts/application#{detect_js_format[0]}", /\/\/= require jquery\n/, ""
           insert_into_file "app/assets/javascripts/application#{detect_js_format[0]}", "#{detect_js_format[1]} require foundation\n", :after => "jquery_ujs\n"
-          append_to_file "app/assets/javascripts/application#{detect_js_format[0]}", "\n$(function(){ $(document).foundation(); });\n"
+          append_to_file "app/assets/javascripts/application#{detect_js_format[0]}", "#{detect_js_format[2]}"
           settings_file = File.join(File.dirname(__FILE__),"..", "..", "..", "..", "vendor", "assets", "stylesheets", "foundation", "_settings.scss")
           create_file "app/assets/stylesheets/foundation_and_overrides.scss", File.read(settings_file)
           append_to_file "app/assets/stylesheets/foundation_and_overrides.scss", "\n@import 'foundation';\n"
           insert_into_file "app/assets/stylesheets/application#{detect_css_format[0]}", "\n#{detect_css_format[1]} require foundation_and_overrides\n", :after => "require_self"
         end
 
         def detect_js_format
-          return ['.coffee', '#='] if File.exist?('app/assets/javascripts/application.coffee')
-          return ['.js.coffee', '#='] if File.exist?('app/assets/javascripts/application.js.coffee')
-          return ['.js', '//='] if File.exist?('app/assets/javascripts/application.js')
+          return ['.coffee', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.coffee')
+          return ['.js.coffee', '#=', "\n() ->\n  $(document).foundation()\n"] if File.exist?('app/assets/javascripts/application.js.coffee')
+          return ['.js', '//=', "\n$(function(){ $(document).foundation(); });\n"] if File.exist?('app/assets/javascripts/application.js')
         end
 
         def detect_css_format

diff --git a/lib/foundation/rails/templates/application.html.erb b/lib/foundation/rails/templates/application.html.erb
diff --git a/lib/foundation/rails/templates/application.html.haml b/lib/foundation/rails/templates/application.html.haml
diff --git a/lib/foundation/rails/templates/application.html.slim b/lib/foundation/rails/templates/application.html.slim
diff --git a/lib/foundation/rails/version.rb b/lib/foundation/rails/version.rb
@@ -1,5 +1,5 @@
 module Foundation
   module Rails
-    VERSION = "5.3.3.1"
+    VERSION = "5.4.5.0"
   end
 end
diff --git a/test/dummy/.gitignore b/test/dummy/.gitignore
diff --git a/test/dummy/.ruby-version b/test/dummy/.ruby-version
diff --git a/test/dummy/Gemfile b/test/dummy/Gemfile
diff --git a/test/dummy/README.rdoc b/test/dummy/README.rdoc
diff --git a/test/dummy/Rakefile b/test/dummy/Rakefile
diff --git a/test/dummy/app/assets/images/.keep b/test/dummy/app/assets/images/.keep
diff --git a/test/dummy/app/assets/javascripts/application.js b/test/dummy/app/assets/javascripts/application.js
diff --git a/test/dummy/app/assets/stylesheets/application.css b/test/dummy/app/assets/stylesheets/application.css
diff --git a/test/dummy/app/assets/stylesheets/foundation_and_overrides.scss b/test/dummy/app/assets/stylesheets/foundation_and_overrides.scss
diff --git a/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb
diff --git a/test/dummy/app/controllers/concerns/.keep b/test/dummy/app/controllers/concerns/.keep
diff --git a/test/dummy/app/controllers/styleguide_controller.rb b/test/dummy/app/controllers/styleguide_controller.rb
diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb
diff --git a/test/dummy/app/helpers/styleguide_helper.rb b/test/dummy/app/helpers/styleguide_helper.rb
diff --git a/test/dummy/app/mailers/.keep b/test/dummy/app/mailers/.keep
diff --git a/test/dummy/app/models/.keep b/test/dummy/app/models/.keep
diff --git a/test/dummy/app/models/concerns/.keep b/test/dummy/app/models/concerns/.keep
diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb
diff --git a/test/dummy/app/views/styleguide/show.html.erb b/test/dummy/app/views/styleguide/show.html.erb
diff --git a/test/dummy/config.ru b/test/dummy/config.ru
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb
diff --git a/test/dummy/config/database.yml b/test/dummy/config/database.yml
diff --git a/test/dummy/config/environment.rb b/test/dummy/config/environment.rb
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
diff --git a/test/dummy/config/initializers/backtrace_silencers.rb b/test/dummy/config/initializers/backtrace_silencers.rb
diff --git a/test/dummy/config/initializers/filter_parameter_logging.rb b/test/dummy/config/initializers/filter_parameter_logging.rb
diff --git a/test/dummy/config/initializers/inflections.rb b/test/dummy/config/initializers/inflections.rb
diff --git a/test/dummy/config/initializers/mime_types.rb b/test/dummy/config/initializers/mime_types.rb
diff --git a/test/dummy/config/initializers/secret_token.rb b/test/dummy/config/initializers/secret_token.rb
diff --git a/test/dummy/config/initializers/session_store.rb b/test/dummy/config/initializers/session_store.rb
diff --git a/test/dummy/config/initializers/wrap_parameters.rb b/test/dummy/config/initializers/wrap_parameters.rb
diff --git a/test/dummy/config/locales/en.yml b/test/dummy/config/locales/en.yml
diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb
diff --git a/test/dummy/db/seeds.rb b/test/dummy/db/seeds.rb
diff --git a/test/dummy/lib/assets/.keep b/test/dummy/lib/assets/.keep
diff --git a/test/dummy/lib/tasks/.keep b/test/dummy/lib/tasks/.keep
diff --git a/test/dummy/log/.keep b/test/dummy/log/.keep
diff --git a/test/dummy/public/404.html b/test/dummy/public/404.html
diff --git a/test/dummy/public/422.html b/test/dummy/public/422.html
diff --git a/test/dummy/public/500.html b/test/dummy/public/500.html
diff --git a/test/dummy/public/favicon.ico b/test/dummy/public/favicon.ico
diff --git a/test/dummy/public/robots.txt b/test/dummy/public/robots.txt
diff --git a/test/dummy/test/controllers/.keep b/test/dummy/test/controllers/.keep
diff --git a/test/dummy/test/controllers/styleguide_controller_test.rb b/test/dummy/test/controllers/styleguide_controller_test.rb
diff --git a/test/dummy/test/fixtures/.keep b/test/dummy/test/fixtures/.keep
diff --git a/test/dummy/test/helpers/.keep b/test/dummy/test/helpers/.keep
diff --git a/test/dummy/test/helpers/styleguide_helper_test.rb b/test/dummy/test/helpers/styleguide_helper_test.rb
diff --git a/test/dummy/test/integration/.keep b/test/dummy/test/integration/.keep
diff --git a/test/dummy/test/mailers/.keep b/test/dummy/test/mailers/.keep
diff --git a/test/dummy/test/models/.keep b/test/dummy/test/models/.keep
diff --git a/test/dummy/test/test_helper.rb b/test/dummy/test/test_helper.rb
diff --git a/test/dummy/vendor/assets/javascripts/.keep b/test/dummy/vendor/assets/javascripts/.keep
diff --git a/test/dummy/vendor/assets/stylesheets/.keep b/test/dummy/vendor/assets/stylesheets/.keep