From 2d63dda6fe12ade325bd44300a4f62c5c62f459b Mon Sep 17 00:00:00 2001
From: Lawrence Pit <lawrence.pit@gmail.com>
Date: Sat, 19 Jul 2008 15:51:02 +1000
Subject: [PATCH] submit_tag with confirmation and disable_with

---
 .../lib/action_view/helpers/form_tag_helper.rb     |    4 ++--
 actionpack/test/template/form_tag_helper_test.rb   |    9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index bdfb2ee..e003066 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -362,8 +362,8 @@ module ActionView
         end
 
         if confirm = options.delete("confirm")
-          options["onclick"] ||= ''
-          options["onclick"] += "return #{confirm_javascript_function(confirm)};"
+          options["onclick"] ||= 'return true;'
+          options["onclick"] = "if (!#{confirm_javascript_function(confirm)}) return false; #{options['onclick']}"
         end
 
         tag :input, { "type" => "submit", "name" => "commit", "value" => value }.update(options.stringify_keys)
diff --git a/actionpack/test/template/form_tag_helper_test.rb b/actionpack/test/template/form_tag_helper_test.rb
index 4e4102a..ae6c5cf 100644
--- a/actionpack/test/template/form_tag_helper_test.rb
+++ b/actionpack/test/template/form_tag_helper_test.rb
@@ -231,11 +231,18 @@ class FormTagHelperTest < ActionView::TestCase
 
   def test_submit_tag_with_confirmation
     assert_dom_equal(
-      %(<input name='commit' type='submit' value='Save' onclick="return confirm('Are you sure?');"/>),
+      %(<input name='commit' type='submit' value='Save' onclick="if (!confirm('Are you sure?')) return false; return true;"/>),
       submit_tag("Save", :confirm => "Are you sure?")
     )
   end
 
+  def test_submit_tag_with_confirmation_and_with_disable_with
+      assert_dom_equal(
+        %(<input name='commit' type='submit' value='Save' onclick="if (!confirm('Are you sure?')) return false; 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...", :confirm => "Are you sure?")
+      )
+  end
+
   def test_pass
     assert_equal 1, 1
   end
-- 
1.5.5.1