Merge pull request #138 from Rio517/master

Don't inject backbone requires based on `//= require_tree .` Fix #100 Fix #158
codebrew · Feb 16, 2014 · 1ce2286 · 1ce2286
2 parents 271b50c + 2b761b0
commit 1ce2286
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/generators/backbone/install/install_generator.rb b/lib/generators/backbone/install/install_generator.rb
@@ -13,14 +13,14 @@ class InstallGenerator < Rails::Generators::Base
                               :desc => "Skip Git ignores and keeps"
 
       def inject_backbone
-        inject_into_file "app/assets/javascripts/application.js", :before => "//= require_tree" do
+        append_to_file "app/assets/javascripts/application.js" do
           "//= require underscore\n//= require backbone\n//= require backbone_rails_sync\n//= require backbone_datalink\n//= require backbone/#{application_name.underscore}\n"
         end
       end
 
       def create_dir_layout
         %W{routers models views templates}.each do |dir|
-          empty_directory "app/assets/javascripts/backbone/#{dir}" 
+          empty_directory "app/assets/javascripts/backbone/#{dir}"
           create_file "app/assets/javascripts/backbone/#{dir}/.gitkeep" unless options[:skip_git]
         end
       end

diff --git a/test/dummy/app/assets/javascripts/application.js b/test/dummy/app/assets/javascripts/application.js
@@ -7,5 +7,4 @@
 //= require backbone
 //= require backbone_rails_sync
 //= require backbone_datalink
-//= require backbone/dummy
-//= require_tree .
+//= require backbone/dummy