<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -20,7 +20,7 @@ module Watir
       end
 
       def fire_event(flex_locator, event_name, args) # :nodoc:
-        eval_js %{return element.fireFunFXEvent(#{flex_locator}, #{event_name.inspect}, &quot;#{args}&quot;)}
+        eval_js %{return element.fireFunFXEvent(#{flex_locator}, #{event_name.inspect}, &quot;#{escape_double_quotes(args)}&quot;)}
       end
 
       def get_property_value(flex_locator, property) # :nodoc:
@@ -42,6 +42,10 @@ module Watir
         raise &quot;Nothing returned from Safari. Are you sure you have compiled the Flex app with FunFX?&quot; if result.nil?
         result
       end
+      
+      def escape_double_quotes(_string)
+        _string.gsub(/&quot;/, '\\\\&quot;')
+      end
     end
   end
 end</diff>
      <filename>gem/lib/funfx/browser/safariwatir.rb</filename>
    </modified>
    <modified>
      <diff>@@ -17,6 +17,20 @@ describe &quot;DemoApp&quot; do
     text_area.text.should == &quot;Text&quot;
   end
   
+  it &quot;should allow to enter text with quotes&quot; do
+    text_area = @flex.text_area({:id =&gt; 'tTextArea'})
+    text_area.input('&quot;test with double quotes&quot;')
+    
+    text_area.text.should == '&quot;test with double quotes&quot;'
+  end
+  
+  it &quot;should allow to pass nil and should skip adding value&quot; do
+    text_area = @flex.text_area({:id =&gt; 'tTextArea'})
+    text_area.input(nil)
+    
+    text_area.text.should == ''
+  end
+  
   it &quot;should select text and enter new text&quot; do
     text_area = @flex.text_area({:id =&gt; 'tTextArea'})
     text_area.input('Old text message')</diff>
      <filename>gem/spec/funfx/demo_app/text_area_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>655ff090616a2b612d5639bcd6040d4126a2b49f</id>
    </parent>
    <parent>
      <id>56628770ee5b97a09d90275dfede02e9ea87f52d</id>
    </parent>
  </parents>
  <author>
    <name>Aslak Helles&#248;y</name>
    <email>aslak.hellesoy@gmail.com</email>
  </author>
  <url>http://github.com/aslakhellesoy/funfx/commit/1d6d7c11bc951ecf8273482e532f7ee2c82aa240</url>
  <id>1d6d7c11bc951ecf8273482e532f7ee2c82aa240</id>
  <committed-date>2008-12-29T07:08:44-08:00</committed-date>
  <authored-date>2008-12-29T07:08:44-08:00</authored-date>
  <message>Merge branch 'master' of git://github.com/lacomartincik/funfx</message>
  <tree>293e3a3901c06f93a2b8ed28331a80658e645cf1</tree>
  <committer>
    <name>Aslak Helles&#248;y</name>
    <email>aslak.hellesoy@gmail.com</email>
  </committer>
</commit>
