safariwatir 0.3.1 → 0.3.2

data/safariwatir.rb

@@ -107,6 +107,9 @@ module Watir
 
       def operate(&block)
         scripter_suffix = OPERATIONS[how]
+        if scripter_suffix.kind_of? Hash
+          scripter_suffix = scripter_suffix[name]
+        end
         if scripter_suffix.nil?
           raise "SafariWatir does not currently support finding by #{how}"
         end
@@ -118,10 +121,11 @@ module Watir
         :index => "by_index",
         :class => "by_class",
         :name => "by_name",
-        :text => "on_link",
+        :text => { "Link" => "on_link", "Label" => "by_text" },
         :url => "on_link",
         :value => "by_input_value",
-        :caption => "by_input_value"
+        :caption => "by_input_value",
+        :src => "by_src",
       }
     end
 
@@ -166,13 +170,9 @@ module Watir
     end
     
     class Image < HtmlElement
-      def tag; "IMG"; end
-      
-      protected
+      include Clickable
       
-      def operate_by_src(&block)
-        @scripter.operate_by(self, 'src', &block)
-      end
+      def tag; "IMG"; end
     end
     
     class Button < InputElement
@@ -203,12 +203,6 @@ module Watir
 
     class Label < ContentElement
       def tag; "LABEL"; end
-      
-      protected
-      
-      def operate_by_text(&block)
-        @scripter.operate_by(self, 'innerText', &block)
-      end
     end
 
     class Link < ContentElement

data/safariwatir/scripter.rb

@@ -247,19 +247,21 @@ element.setSelectionRange(element.value.length, element.value.length);|
 
     def click_element(element = @element)
       page_load do
+# Not sure if these events should be either/or. But if you have an image with an onclick, it fires twice without the else clause.
         execute(element.operate { %|
 if (element.click) {
   element.click();
 } else {
-  var event = DOCUMENT.createEvent('MouseEvents');
-  event.initEvent('click', true, true);
-  element.dispatchEvent(event);
-
   if (element.onclick) {
     var event = DOCUMENT.createEvent('HTMLEvents');
     event.initEvent('click', true, true);
     element.onclick(event);
+  } else {
+    var event = DOCUMENT.createEvent('MouseEvents');
+    event.initEvent('click', true, true);
+    element.dispatchEvent(event);    
   }
+
 }| })
       end
     end
@@ -392,6 +394,14 @@ var element = elements[0];|, yield)
       js.operate(%|var element = document.getElementsByTagName('#{element.tag}')[#{element.what-1}];|, yield)
     end
 
+    def operate_by_src(element, &block)
+      operate_by(element, 'src', &block)
+    end
+
+    def operate_by_text(element, &block)
+      operate_by(element, 'innerText', &block)
+    end
+
     def operate_by(element, attribute)
       js.operate(%|var elements = document.getElementsByTagName('#{element.tag}');
 var element = undefined;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: safariwatir
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Dave Hoover
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-22 00:00:00 -05:00
+date: 2008-10-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency