Rename activeObjectHighLightColor to active_object_highlight_color.

watir · Jan 5, 2013 · ccf7474 · ccf7474
1 parent e786001
commit ccf7474
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/lib/watir-classic/container.rb b/lib/watir-classic/container.rb
@@ -30,7 +30,7 @@ module Container
 
     # The color we want to use for the active object. This can be any valid web-friendly color.
     # @private
-    attr_accessor :activeObjectHighLightColor
+    attr_accessor :active_object_highlight_color
 
     # The {Browser} object containing this element.
     attr_accessor :page_container
@@ -39,7 +39,7 @@ module Container
     def copy_test_config(container) # only used by form and frame
       @typingspeed = container.typingspeed
       @type_keys = container.type_keys
-      @activeObjectHighLightColor = container.activeObjectHighLightColor
+      @active_object_high_light_color = container.active_object_highlight_color
     end
     private :copy_test_config
 

diff --git a/lib/watir-classic/element.rb b/lib/watir-classic/element.rb
@@ -190,8 +190,8 @@ def type_keys
     end
 
     # @private
-    def activeObjectHighLightColor
-      @container.activeObjectHighLightColor
+    def active_object_highlight_color
+      @container.active_object_highlight_color
     end
 
     # Return an array with many of the properties, in a format to be used by the to_s method
@@ -215,7 +215,7 @@ def to_s
     def highlight(set_or_clear)
       if set_or_clear == :set
         @original_color ||= ole_object.style.backgroundColor
-        ole_object.style.backgroundColor = @container.activeObjectHighLightColor
+        ole_object.style.backgroundColor = @container.active_object_highlight_color
       else
         ole_object.style.backgroundColor = @original_color if @original_color
       end

diff --git a/lib/watir-classic/form.rb b/lib/watir-classic/form.rb
@@ -67,7 +67,7 @@ def highlight(set_or_clear, element, count)
         begin
           original_color = element.style.backgroundColor
           original_color = "" if original_color==nil
-          element.style.backgroundColor = activeObjectHighLightColor
+          element.style.backgroundColor = active_object_highlight_color
         rescue => e
           puts e
           puts e.backtrace.join("\n")

diff --git a/lib/watir-classic/ie-class.rb b/lib/watir-classic/ie-class.rb
@@ -194,7 +194,7 @@ def initialize_options
       @ole_object = nil
       @page_container = self
       @error_checkers = []
-      @activeObjectHighLightColor = HIGHLIGHT_COLOR
+      @active_object_highlight_color = HIGHLIGHT_COLOR
       @url_list = []
     end