<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -111,7 +111,7 @@ module ActionView
                          (100..599).to_a)
         AJAX_OPTIONS = Set.new([ :before, :after, :condition, :url,
                          :asynchronous, :method, :insertion, :position,
-                         :form, :with, :update, :script ]).merge(CALLBACKS)
+                         :form, :with, :update, :script, :type ]).merge(CALLBACKS)
       end
 
       # Returns a link to a remote action defined by &lt;tt&gt;options[:url]&lt;/tt&gt;</diff>
      <filename>actionpack/lib/action_view/helpers/prototype_helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -77,6 +77,8 @@ class PrototypeHelperTest &lt; PrototypeHelperBaseTest
       link_to_remote(&quot;Remote outauthor&quot;, :failure =&gt; &quot;alert(request.responseText)&quot;, :url =&gt; { :action =&gt; &quot;whatnot&quot;  })
     assert_dom_equal %(&lt;a href=\&quot;#\&quot; onclick=\&quot;new Ajax.Request('http://www.example.com/whatnot?a=10&amp;amp;b=20', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\&quot;&gt;Remote outauthor&lt;/a&gt;),
       link_to_remote(&quot;Remote outauthor&quot;, :failure =&gt; &quot;alert(request.responseText)&quot;, :url =&gt; { :action =&gt; &quot;whatnot&quot;, :a =&gt; '10', :b =&gt; '20' })
+    assert_dom_equal %(&lt;a href=\&quot;#\&quot; onclick=\&quot;new Ajax.Request('http://www.example.com/whatnot', {asynchronous:false, evalScripts:true}); return false;\&quot;&gt;Remote outauthor&lt;/a&gt;),
+      link_to_remote(&quot;Remote outauthor&quot;, :url =&gt; { :action =&gt; &quot;whatnot&quot; }, :type =&gt; :synchronous)
   end
 
   def test_link_to_remote_html_options
@@ -429,6 +431,8 @@ Element.update(&quot;baz&quot;, &quot;\\u003Cp\\u003EThis is a test\\u003C/p\\u003E&quot;);
   def test_sortable
     assert_equal %(Sortable.create(&quot;blah&quot;, {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize(&quot;blah&quot;)})}});),
       @generator.sortable('blah', :url =&gt; { :action =&gt; &quot;order&quot; })
+    assert_equal %(Sortable.create(&quot;blah&quot;, {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:false, evalScripts:true, parameters:Sortable.serialize(&quot;blah&quot;)})}});),
+      @generator.sortable('blah', :url =&gt; { :action =&gt; &quot;order&quot; }, :type =&gt; :synchronous)
   end
 
   def test_draggable
@@ -439,6 +443,8 @@ Element.update(&quot;baz&quot;, &quot;\\u003Cp\\u003EThis is a test\\u003C/p\\u003E&quot;);
   def test_drop_receiving
     assert_equal %(Droppables.add(&quot;blah&quot;, {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});),
       @generator.drop_receiving('blah', :url =&gt; { :action =&gt; &quot;order&quot; })
+    assert_equal %(Droppables.add(&quot;blah&quot;, {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:false, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});),
+      @generator.drop_receiving('blah', :url =&gt; { :action =&gt; &quot;order&quot; }, :type =&gt; :synchronous)
   end
 
   def test_collection_first_and_last</diff>
      <filename>actionpack/test/template/prototype_helper_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>cb68b21a52a12b0773f0b4dac1c9c673c93ba355</id>
    </parent>
  </parents>
  <author>
    <name>miloops</name>
    <email>miloops@gmail.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/f3da46effae9f23f6ea473f7296e9c0c9bb49fce</url>
  <id>f3da46effae9f23f6ea473f7296e9c0c9bb49fce</id>
  <committed-date>2008-07-31T12:28:12-07:00</committed-date>
  <authored-date>2008-07-31T12:09:18-07:00</authored-date>
  <message>In javascript helpers option[:type] = :synchronous should work as described in docs.

Signed-off-by: Michael Koziarski &lt;michael@koziarski.com&gt;</message>
  <tree>308a7248051c36a2ca39f3559f84c96c70e8f550</tree>
  <committer>
    <name>Michael Koziarski</name>
    <email>michael@koziarski.com</email>
  </committer>
</commit>
