Permalink
Browse files

Set template_format to html inside rjs templates so renders within it…

… default to html.
  • Loading branch information...
1 parent ab211bf commit 148aff2097890a81e874a7c60bae5fa3b2a4d1fd @josh josh committed Dec 4, 2008
@@ -327,9 +327,6 @@ def _pick_template(template_path)
elsif (first_render = @_render_stack.first) && first_render.respond_to?(:format_and_extension) &&
(template = self.view_paths["#{template_file_name}.#{first_render.format_and_extension}"])
template
- elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"]
- @template_format = :html
- template
else
template = Template.new(template_path, view_paths)
@@ -4,6 +4,7 @@ class RJS < TemplateHandler
include Compilable
def compile(template)
+ "@template_format = :html;" +
"controller.response.content_type ||= Mime::JS;" +
"update_page do |page|;#{template.source}\nend"
end
@@ -246,15 +246,6 @@ def accessing_local_assigns_in_inline_template
:locals => { :local_name => name }
end
- def helper_method_to_render_to_string(*args)
- render_to_string(*args)
- end
- helper_method :helper_method_to_render_to_string
-
- def render_html_only_partial_within_inline
- render :inline => "Hello world <%= helper_method_to_render_to_string :partial => 'test/partial_with_only_html_version' %>"
- end
-
def render_implicit_html_template
end
@@ -948,11 +939,6 @@ def test_accessing_local_assigns_in_inline_template
assert_equal "Goodbye, Local David", @response.body
end
- def test_rendering_html_only_partial_within_inline_with_js
- get :render_html_only_partial_within_inline, :format => :js
- assert_equal "Hello world partial with only html version", @response.body
- end
-
def test_render_in_an_rjs_template_should_pick_html_templates_when_available
[:js, "js"].each do |format|
assert_nothing_raised do
@@ -137,12 +137,6 @@ def test_render_partial_and_fallback_to_layout
end
# TODO: The reason for this test is unclear, improve documentation
- def test_render_js_partial_and_fallback_to_erb_layout
- @view.template_format = :js
- assert_equal "Before (Josh)\n\nAfter", @view.render(:partial => "test/layout_for_partial", :locals => { :name => "Josh" })
- end
-
- # TODO: The reason for this test is unclear, improve documentation
def test_render_missing_xml_partial_and_raise_missing_template
@view.template_format = :xml
assert_raise(ActionView::MissingTemplate) { @view.render(:partial => "test/layout_for_partial") }

0 comments on commit 148aff2

Please sign in to comment.