aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-12-28 11:14:18 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-12-28 11:14:18 +0000
commit7bd33735d413f06d06b3057e8244f9f3e5b518a5 (patch)
tree7a051be3987334df55835689c0d96306835a6771 /actionpack
parent7555073803ffb455715b74664a0cfb48c271fe89 (diff)
downloadrails-7bd33735d413f06d06b3057e8244f9f3e5b518a5.tar.gz
rails-7bd33735d413f06d06b3057e8244f9f3e5b518a5.tar.bz2
rails-7bd33735d413f06d06b3057e8244f9f3e5b518a5.zip
Introduce ActiveSupport::BasicObject which bridges Builder::BlankSlate and Ruby 1.9 BasicObject. Closes #10634 [Frederick Cheung]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8500 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/helpers/prototype_helper.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index f4ea25af16..68e22ff032 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -1065,11 +1065,7 @@ module ActionView
end
# Converts chained method calls on DOM proxy elements into JavaScript chains
- class JavaScriptProxy < BasicObject #:nodoc:
- if ::RUBY_VERSION >= '1.9'
- undef_method :==
- undef_method :equal?
- end
+ class JavaScriptProxy < ActiveSupport::BasicObject #:nodoc:
def initialize(generator, root = nil)
@generator = generator