diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-13 03:27:26 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-03-13 03:27:26 +0000 |
| commit | 75b8a66638c0acff2fd7761a1e83befc35e5d0ba (patch) | |
| tree | 5ccd3c3e566ca90fda2dca04d104487ba1803172 /actionpack/lib/action_controller | |
| parent | c07c48d10a4b96c83befe25dc27f558bc59cfc9d (diff) | |
| download | rails-75b8a66638c0acff2fd7761a1e83befc35e5d0ba.tar.gz rails-75b8a66638c0acff2fd7761a1e83befc35e5d0ba.tar.bz2 rails-75b8a66638c0acff2fd7761a1e83befc35e5d0ba.zip | |
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@3858 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index b0b6069420..0793178a93 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1003,7 +1003,9 @@ module ActionController #:nodoc: end def template_exempt_from_layout?(template_name = default_template_name) - @template.javascript_template_exists?(template_name) + @template.pick_template_extension(template_name).to_sym == :rjs + rescue + false end def assert_existance_of_template_file(template_name) |