mirror of
https://github.com/github/rails.git
synced 2026-01-29 00:08:15 -05:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user