0
@@ -348,11 +348,13 @@ module ActionView
0
         options.stringify_keys!
0
 
0
         if disable_with = options.delete("disable_with")
0
+          disable_with = "this.value='#{disable_with}'"
0
+          disable_with << ";#{options.delete('onclick')}" if options['onclick']
0
+          
0
           options["onclick"] = [
0
             "this.setAttribute('originalValue', this.value)",
0
             "this.disabled=true",
0
-            "this.value='#{disable_with}'",
0
-            "#{options["onclick"]}",
0
+            disable_with,
0
             "result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit())",
0
             "if (result == false) { this.value = this.getAttribute('originalValue'); this.disabled = false }",
0
             "return result;",

0
@@ -222,6 +222,13 @@ class FormTagHelperTest < ActionView::TestCase
0
     )
0
   end
0
 
0
+  def test_submit_tag_with_no_onclick_options
0
+    assert_dom_equal(
0
+      %(<input name='commit' type='submit' value='Save' onclick="this.setAttribute('originalValue', this.value);this.disabled=true;this.value='Saving...';result = (this.form.onsubmit ? (this.form.onsubmit() ? this.form.submit() : false) : this.form.submit());if (result == false) { this.value = this.getAttribute('originalValue'); this.disabled = false };return result;" />),
0
+      submit_tag("Save", :disable_with => "Saving...")
0
+    )
0
+  end
0
+
0
   def test_submit_tag_with_confirmation
0
     assert_dom_equal(
0
       %(<input name='commit' type='submit' value='Save' onclick="return confirm('Are you sure?');"/>),