diff options
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 6 | ||||
| -rw-r--r-- | activesupport/lib/active_support/basic_object.rb | 17 |
2 files changed, 14 insertions, 9 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 diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb index 5e79de993f..009a521a40 100644 --- a/activesupport/lib/active_support/basic_object.rb +++ b/activesupport/lib/active_support/basic_object.rb @@ -1,5 +1,14 @@ -# Ruby 1.9 introduces BasicObject. Use Builder's BlankSlate until then. -unless defined? BasicObject - require 'blankslate' - BasicObject = BlankSlate +# Ruby 1.9 introduces BasicObject which differs slighly from Builder's BlankSlate +# that had been used so far ActiveSupport::BasicObject provides a barebones object with +# the same method on both versions. +module ActiveSupport + if RUBY_VERSION >= '1.9' + class BasicObject < ::BasicObject + undef_method :== + undef_method :equal? + end + else + require 'blankslate' + BasicObject = BlankSlate + end end |