Merge pull request #230 from brentdodell/upgrade-to-6-4-0

Upgrade to foundation-sites 6.4.1
foundation · Jul 3, 2017 · be3a8fc · be3a8fc · trevorh2007 · Jul 9, 2017
2 parents 23edda0 + 77a5c5b
commit be3a8fc
Show file tree

Hide file tree

Showing 137 changed files with 6,597 additions and 2,004 deletions.
diff --git a/bower.json b/bower.json
@@ -1,8 +1,8 @@
 {
   "name": "foundation-rails",
-  "version": "6.3.1.0",
+  "version": "6.4.1.0",
   "dependencies": {
-    "foundation-sites": "6.3.1",
-    "motion-ui": "1.2.2"
+    "foundation-sites": "6.4.1",
+    "motion-ui": "1.2.3"
   }
 }
diff --git a/lib/foundation/rails/version.rb b/lib/foundation/rails/version.rb
@@ -1,5 +1,5 @@
 module Foundation
   module Rails
-    VERSION = "6.3.1.0"
+    VERSION = "6.4.1.0"
   end
 end
diff --git a/lib/generators/foundation/install_generator.rb b/lib/generators/foundation/install_generator.rb
@@ -13,7 +13,7 @@ class InstallGenerator < ::Rails::Generators::Base
       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 File.join(javascripts_base_dir, "application#{detect_js_format[0]}"), "#{detect_js_format[1]} require foundation\n", :after => "jquery_ujs\n"
+        insert_into_file File.join(javascripts_base_dir, "application#{detect_js_format[0]}"), "#{detect_js_format[1]} require foundation\n", :after => "rails-ujs\n"
         append_to_file File.join(javascripts_base_dir, "application#{detect_js_format[0]}"), "#{detect_js_format[2]}"
         create_app_scss
         insert_into_file File.join(stylesheets_base_dir, "application#{detect_css_format[0]}"), "\n#{detect_css_format[1]} require foundation_and_overrides\n", :after => "require_self"