aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorMike Gunderloy <MikeG1@larkfarm.com>2008-11-16 20:44:30 -0600
committerMike Gunderloy <MikeG1@larkfarm.com>2008-11-16 20:46:36 -0600
commit1d8c4cf6e0b115bac598f7d817ee98dc298580ff (patch)
treee0bf0e909e781ba3a64a19af043249dbcad20734 /actionpack/lib
parentb58d0a944726f26d48d44e7b002e0b0bad32fe85 (diff)
downloadrails-1d8c4cf6e0b115bac598f7d817ee98dc298580ff.tar.gz
rails-1d8c4cf6e0b115bac598f7d817ee98dc298580ff.tar.bz2
rails-1d8c4cf6e0b115bac598f7d817ee98dc298580ff.zip
Fix markup for cattr_accessors in Action View and Action Mailer to work better with RDoc 2+.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/base.rb8
-rw-r--r--actionpack/lib/action_view/template_handlers/erb.rb2
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