From 928627292ce8d1c33589c574475a2edba105be73 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 13 Mar 2006 03:29:39 +0000 Subject: 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 --- actionpack/lib/action_controller/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0793178a93..da48dc3255 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1003,7 +1003,7 @@ module ActionController #:nodoc: 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 -- cgit v1.2.3