From 1385027f7c3285c65e441bbdfa8b83e3920fdd29 Mon Sep 17 00:00:00 2001
From: Scott Stewart <scott@izoca.com>
Date: Wed, 11 Jun 2008 00:43:50 -0400
Subject: [PATCH] submit_tag in form_tag_helper emitts an extra semicolon when no onclick options are provided

---
 .../lib/action_view/helpers/form_tag_helper.rb     |    2 +-
 actionpack/test/template/form_tag_helper_test.rb   |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 3a97f13..58e1bc5 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -356,7 +356,7 @@ module ActionView
             "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;",
-          ].join(";")
+          ].reject{|item| item.to_s.empty?}.join(";")
         end
         
         if confirm = options.delete("confirm")
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 47b3605..2dbdfaa 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -220,6 +220,13 @@ class FormTagHelperTest < ActionView::TestCase
     )
   end
 
+  def test_submit_tag_with_no_onclick_options
+    assert_dom_equal(
+      %(<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;" />),
+      submit_tag("Save", :disable_with => "Saving...")
+    )
+  end
+
   def test_submit_tag_with_confirmation
     assert_dom_equal(
       %(<input name='commit' type='submit' value='Save' onclick="return confirm('Are you sure?');"/>),
-- 
1.5.4.3