diff options
| author | Jeff Dean <jeff@zilkey.com> | 2008-11-16 23:09:26 -0500 |
|---|---|---|
| committer | Jeff Dean <jeff@zilkey.com> | 2008-11-16 23:09:26 -0500 |
| commit | 223ffb5fa50b217b1f62025f4fb11c7a6e9e431d (patch) | |
| tree | 9b18544d519f785558a2dcc112cffa8d8291513f /actionpack/lib | |
| parent | e08af7219795d28fe9e9eb5f0dc2e7488541382e (diff) | |
| parent | 80f5f265471e8d53b66f432c203206c1a4197121 (diff) | |
| download | rails-223ffb5fa50b217b1f62025f4fb11c7a6e9e431d.tar.gz rails-223ffb5fa50b217b1f62025f4fb11c7a6e9e431d.tar.bz2 rails-223ffb5fa50b217b1f62025f4fb11c7a6e9e431d.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 8 | ||||
| -rw-r--r-- | actionpack/lib/action_view/template_handlers/erb.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 945246a39a..a8ca0f685f 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -183,13 +183,17 @@ module ActionView #:nodoc: @@exempt_from_layout.merge(regexps) end + @@debug_rjs = false + ## + # :singleton-method: # Specify whether RJS responses should be wrapped in a try/catch block # that alert()s the caught exception (and then re-raises it). - @@debug_rjs = false cattr_accessor :debug_rjs - # A warning will be displayed whenever an action results in a cache miss on your view paths. @@warn_cache_misses = false + ## + # :singleton-method: + # A warning will be displayed whenever an action results in a cache miss on your view paths. cattr_accessor :warn_cache_misses attr_internal :request diff --git a/actionpack/lib/action_view/template_handlers/erb.rb b/actionpack/lib/action_view/template_handlers/erb.rb index 3def949f1e..0fec1e0b18 100644 --- a/actionpack/lib/action_view/template_handlers/erb.rb +++ b/actionpack/lib/action_view/template_handlers/erb.rb @@ -42,6 +42,8 @@ module ActionView class ERB < TemplateHandler include Compilable + ## + # :singleton-method: # Specify trim mode for the ERB compiler. Defaults to '-'. # See ERb documentation for suitable values. cattr_accessor :erb_trim_mode |