watir/locator.rb in watir-1.5.3 vs watir/locator.rb in watir-1.5.4

@@ -74,6 +74,75 @@
               "#{how} is an unknown way of finding a <#{@tag}> element (#{what})"
       end
     end
 
   end  
+  class InputElementLocator
+    attr_accessor :document, :element, :elements
+    def initialize container, types
+      @container = container
+      @types = types
+      @elements = nil
+    end
+    def specifier= arg
+      how, what, value = arg
+      how = :value if how == :caption
+      how = :class_name if how == :class
+      what = what.to_i if how == :index
+      value = value.to_s if value 
+      @how = how
+      @what = what
+      @value = value
+    end
+    def locate
+      object_index = 1
+      @elements.each do |object|
+        element = Element.new(object)
+        if @types.include?(element.type)
+          if @how == :index
+            attribute = object_index
+          else
+            begin
+              attribute = element.send(@how)
+            rescue NoMethodError
+              raise MissingWayOfFindingObjectException,
+                "#{@how} is an unknown way of finding an <INPUT> element (#{@what})"
+            end
+          end
+          if @what.matches(attribute)
+            if @value
+              if element.value == @value
+                return object
+              end
+            else
+              return object
+            end
+          end
+          object_index += 1
+        end
+      end
+      return nil
+    end
+    def fast_locate
+      # Searching through all elements returned by ole_inner_elements
+      # is *significantly* slower than IE's getElementById() and
+      # getElementsByName() calls when how is :id or :name.  However
+      # IE doesn't match Regexps, so first we make sure what is a String.
+      # In addition, IE's getElementById() will also return an element
+      # where the :name matches, so we will only return the results of
+      # getElementById() if the matching element actually HAS a matching
+      # :id.
+      begin
+        if @what.class == String   # Only use fast calls with String what.
+          if @how == :id
+            @element = @document.getElementById(what)
+            # Return if our fast match really HAS a matching :id
+            return @element if @element.nil? or @element.invoke('id') == what
+          elsif how == :name
+            @elements = @document.getElementsByName(what)
+          end
+        end
+      rescue
+      end      
+    end
+  end
 end