aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2008-01-30 21:09:32 +0000
committerMichael Koziarski <michael@koziarski.com>2008-01-30 21:09:32 +0000
commit1ba5fc745bbe4ad9dacbfe6aa41138ec68540cc7 (patch)
treecfe7b038c7fc3d71948021c8cc9291f9c98627cd /actionpack
parent05707a436bb259a00fc11cfb78d453fe52bb6264 (diff)
downloadrails-1ba5fc745bbe4ad9dacbfe6aa41138ec68540cc7.tar.gz
rails-1ba5fc745bbe4ad9dacbfe6aa41138ec68540cc7.tar.bz2
rails-1ba5fc745bbe4ad9dacbfe6aa41138ec68540cc7.zip
Move the declaration of the compilation related cattr_accessors to compilable. Closes #10959 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8756 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/template_handler.rb11
-rw-r--r--actionpack/lib/action_view/template_handlers/compilable.rb12
2 files changed, 12 insertions, 11 deletions
diff --git a/actionpack/lib/action_view/template_handler.rb b/actionpack/lib/action_view/template_handler.rb
index d4892eccd3..70fa02674f 100644
--- a/actionpack/lib/action_view/template_handler.rb
+++ b/actionpack/lib/action_view/template_handler.rb
@@ -1,16 +1,5 @@
module ActionView
class TemplateHandler
- # Map method names to their compile time
- cattr_accessor :compile_time
- @@compile_time = {}
-
- # Map method names to the names passed in local assigns so far
- cattr_accessor :template_args
- @@template_args = {}
-
- # Count the number of inline templates
- cattr_accessor :inline_template_count
- @@inline_template_count = 0
def self.line_offset
0
diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
index e4a36b8d15..6ab4f69558 100644
--- a/actionpack/lib/action_view/template_handlers/compilable.rb
+++ b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -4,6 +4,18 @@ module ActionView
def self.included(base)
base.extend ClassMethod
+
+ # Map method names to their compile time
+ base.cattr_accessor :compile_time
+ base.compile_time = {}
+
+ # Map method names to the names passed in local assigns so far
+ base.cattr_accessor :template_args
+ base.template_args = {}
+
+ # Count the number of inline templates
+ base.cattr_accessor :inline_template_count
+ base.inline_template_count = 0
end
module ClassMethod