Permalink
Browse files

Use driver_ujs now that we no longer have to depend on a shared name …

…and insert all prototype dependencies if thats specified
  • Loading branch information...
1 parent 26528ef commit 17c1b0f0d3fa89758c6de0a62754e7e3cd74458c @dhh dhh committed Apr 13, 2011
@@ -124,7 +124,7 @@ def vendor_javascripts
empty_directory_with_gitkeep "vendor/assets/javascripts"
else
copy_file "vendor/assets/javascripts/#{options[:javascript]}.js"
- copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js", "vendor/assets/javascripts/rails.js"
+ copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js"
if options[:javascript] == "prototype"
copy_file "vendor/assets/javascripts/controls.js"
@@ -0,0 +1,11 @@
+# FIXME: Tell people that this is a manifest file, real code should go into discrete files
+# FIXME: Tell people how Sprockets and CoffeeScript works
+#
+#= require <%= options[:javascript] %>
+#= require <%= options[:javascript] %>_ujs
+<% if options[:javascript] == "prototype" %>
+#= require controls
+#= require dragdrop
+#= require effects
+<% end -%>
+#= require_tree .

0 comments on commit 17c1b0f

Please sign in to comment.