app/helpers/requirejs_helper.rb in requirejs-rails-0.6.1 vs app/helpers/requirejs_helper.rb in requirejs-rails-0.7.0

- old
+ new

@@ -22,21 +22,27 @@ "" end end def requirejs_include_tag(name=nil, &block) - html = "" requirejs = Rails.application.config.requirejs + if requirejs.loader == :almond + name = requirejs.module_name_for(requirejs.build_config['modules'][0]) + return _almond_include_tag(name, &block) + end + + html = "" + if controller.requirejs_included raise Requirejs::MultipleIncludeError, "Only one requirejs_include_tag allowed per page." end unless requirejs.run_config.empty? run_config = requirejs.run_config if Rails.application.config.assets.digest - modules = requirejs.build_config['modules'].map { |m| m['name'] } + modules = requirejs.build_config['modules'].map { |m| requirejs.module_name_for m } # Generate digestified paths from the modules spec paths = {} modules.each { |m| paths[m] = javascript_path(m).sub /\.js$/,'' } @@ -53,7 +59,11 @@ <script #{_requirejs_data(name, &block)} src="#{javascript_path 'require.js'}"></script> HTML controller.requirejs_included = true html.html_safe + end + + def _almond_include_tag(name, &block) + "<script src='#{javascript_path name}'></script>\n".html_safe end end