From 093f758bd05d5b6144fd06aa0606c2f987c4ee09 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 27 Jan 2009 14:09:11 -0600
Subject: [PATCH] Restore implicit rendering for XHR requests that want a HTML
 template [#1590 state:resolved]

---
 actionpack/lib/action_view/paths.rb                       | 3 +++
 actionpack/test/controller/render_test.rb                 | 8 ++++++++
 ...ender_implicit_html_template_from_xhr_request.html.erb | 1 +
 3 files changed, 12 insertions(+)
 create mode 100644 actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb

diff --git a/actionpack/lib/action_view/paths.rb b/actionpack/lib/action_view/paths.rb
index cb351620d2260..ee26542a076ff 100644
--- a/actionpack/lib/action_view/paths.rb
+++ b/actionpack/lib/action_view/paths.rb
@@ -45,6 +45,9 @@ def find_template(original_template_path, format = nil)
           return template
         elsif template = load_path[template_path]
           return template
+        # Try to find html version if the format is javascript
+        elsif format == :js && template = load_path["#{template_path}.html"]
+          return template
         end
       end
 
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 8809aa7c34a03..584b9277c4083 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -274,6 +274,9 @@ def render_implicit_html_template
   def render_explicit_html_template
   end
 
+  def render_implicit_html_template_from_xhr_request
+  end
+
   def formatted_html_erb
   end
 
@@ -1010,6 +1013,11 @@ def test_explicitly_rendering_an_html_template_with_implicit_html_template_rende
     end
   end
 
+  def test_should_implicitly_render_html_template_from_xhr_request
+    get :render_implicit_html_template_from_xhr_request, :format => :js
+    assert_equal "Hello HTML!", @response.body
+  end
+
   def test_should_render_formatted_template
     get :formatted_html_erb
     assert_equal 'formatted html erb', @response.body
diff --git a/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb b/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb
new file mode 100644
index 0000000000000..4a11845cfed5c
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.html.erb
@@ -0,0 +1 @@
+Hello HTML!
\ No newline at end of file