The mere existance of a rjs file shouldnt cause the layout to disappear. Made it easier to specify a :with on observer_field

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3859 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2006-03-13 03:29:39 +00:00 · 2006-03-13 03:29:39 +00:00 · 928627292c
commit 928627292c
parent 75b8a66638
1 changed files with 1 additions and 1 deletions
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@ -1003,7 +1003,7 @@ def template_public?(template_name = default_template_name)
      end

      def template_exempt_from_layout?(template_name = default_template_name)
-        @template.pick_template_extension(template_name).to_sym == :rjs
+        template_name.last(3) == "rjs" || @template.pick_template_extension(template_name).to_sym == :rjs
      rescue
        false
      end