aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/helpers.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-11 15:03:24 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-11 15:03:24 -0700
commit0cac68d3bed3e6bf8ec2eb994858e4a179046941 (patch)
tree6f6d89a9bf66064e4acb8392d54648b4bf37f9f0 /actionpack/lib/action_controller/abstract/helpers.rb
parentddbeb15a5e7e0c3c5f316ccf65b557bc5311a6c4 (diff)
downloadrails-0cac68d3bed3e6bf8ec2eb994858e4a179046941.tar.gz
rails-0cac68d3bed3e6bf8ec2eb994858e4a179046941.tar.bz2
rails-0cac68d3bed3e6bf8ec2eb994858e4a179046941.zip
Revert "Whitespace!"
This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716.
Diffstat (limited to 'actionpack/lib/action_controller/abstract/helpers.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/helpers.rb17
1 files changed, 9 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/abstract/helpers.rb b/actionpack/lib/action_controller/abstract/helpers.rb
index 38e3ce8127..62caa119e7 100644
--- a/actionpack/lib/action_controller/abstract/helpers.rb
+++ b/actionpack/lib/action_controller/abstract/helpers.rb
@@ -8,14 +8,14 @@ module AbstractController
extlib_inheritable_accessor :master_helper_module
self.master_helper_module = Module.new
end
-
+
# def self.included(klass)
# klass.class_eval do
# extlib_inheritable_accessor :master_helper_module
# self.master_helper_module = Module.new
# end
# end
-
+
def _action_view
@_action_view ||= begin
av = super
@@ -23,19 +23,19 @@ module AbstractController
av
end
end
-
+
module ClassMethods
def inherited(klass)
klass.master_helper_module = Module.new
klass.master_helper_module.__send__ :include, master_helper_module
-
+
super
end
-
+
def add_template_helper(mod)
master_helper_module.module_eval { include mod }
end
-
+
def helper_method(*meths)
meths.flatten.each do |meth|
master_helper_module.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
@@ -45,7 +45,7 @@ module AbstractController
ruby_eval
end
end
-
+
def helper(*args, &blk)
args.flatten.each do |arg|
case arg
@@ -56,5 +56,6 @@ module AbstractController
master_helper_module.module_eval(&blk) if block_given?
end
end
+
end
-end
+end \ No newline at end of file