From 424a5a7d46176eaa9617ad4fdc99d8c2be53b186 Mon Sep 17 00:00:00 2001
From: Kassio Borges <kassioborgesm@gmail.com>
Date: Fri, 23 Aug 2013 22:46:49 -0300
Subject: fix issue #11605

---
 actionpack/lib/action_view/lookup_context.rb             | 7 ++-----
 actionpack/lib/action_view/renderer/abstract_renderer.rb | 6 ------
 actionpack/lib/action_view/renderer/partial_renderer.rb  | 2 --
 actionpack/lib/action_view/renderer/template_renderer.rb | 5 ++---
 4 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'actionpack/lib/action_view')

diff --git a/actionpack/lib/action_view/lookup_context.rb b/actionpack/lib/action_view/lookup_context.rb
index 1a656ed37f..9f617a9a53 100644
--- a/actionpack/lib/action_view/lookup_context.rb
+++ b/actionpack/lib/action_view/lookup_context.rb
@@ -103,7 +103,7 @@ module ActionView
 
     # Helpers related to template lookup using the lookup context information.
     module ViewPaths
-      attr_reader :view_paths, :html_fallback_for_js
+      attr_reader :view_paths
 
       # Whenever setting view paths, makes a copy so we can manipulate then in
       # instance objects as we wish.
@@ -200,10 +200,7 @@ module ActionView
     def formats=(values)
       if values
         values.concat(default_formats) if values.delete "*/*"
-        if values == [:js]
-          values << :html
-          @html_fallback_for_js = true
-        end
+        values << :html if values == [:js]
       end
       super(values)
     end
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb
index b79b89e142..0b5d3785d4 100644
--- a/actionpack/lib/action_view/renderer/abstract_renderer.rb
+++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb
@@ -37,11 +37,5 @@ module ActionView
     def instrument(name, options={})
       ActiveSupport::Notifications.instrument("render_#{name}.action_view", options){ yield }
     end
-
-    def prepend_formats(formats)
-      formats = Array(formats)
-      return if formats.empty? || @lookup_context.html_fallback_for_js
-      @lookup_context.formats = formats | @lookup_context.formats
-    end
   end
 end
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb
index f3300e470b..71fa05ab3e 100644
--- a/actionpack/lib/action_view/renderer/partial_renderer.rb
+++ b/actionpack/lib/action_view/renderer/partial_renderer.rb
@@ -281,8 +281,6 @@ module ActionView
       @block   = block
       @details = extract_details(options)
 
-      prepend_formats(options[:formats])
-
       if String === partial
         @object     = options[:object]
         @path       = partial
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb
index d15e75637a..a27d5dd1b1 100644
--- a/actionpack/lib/action_view/renderer/template_renderer.rb
+++ b/actionpack/lib/action_view/renderer/template_renderer.rb
@@ -10,10 +10,9 @@ module ActionView
       template = determine_template(options)
       context  = @lookup_context
 
-      prepend_formats(template.formats)
-
       unless context.rendered_format
-        context.rendered_format = template.formats.first || formats.last
+        context.formats = template.formats unless template.formats.empty?
+        context.rendered_format = context.formats.first
       end
 
       render_template(template, options[:layout], options[:locals])
-- 
cgit v1.2.3