From f50a5d2eee6ffba0918bfe6a11b99f1f9fa6c58f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 1 Aug 2012 15:59:39 -0300
Subject: Revert "Deprecate link_to_function and button_to_function helpers"

This reverts commit 9dc57fe9c4807fc0ad4b1590a931891d9faa3164.
---
 actionpack/CHANGELOG.md                            |  4 +++
 .../lib/action_view/helpers/javascript_helper.rb   |  4 ---
 actionpack/test/template/javascript_helper_test.rb | 36 ++++++++--------------
 3 files changed, 16 insertions(+), 28 deletions(-)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 296533f21a..c43ec62555 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 *   Reverted the deprecation of `:mouseover` option to `image_tag`. *Rafael Mendonça França*
 
+*   Reverted the deprecation of `button_to_function` and `link_to_function` helpers.
+
+    *Rafael Mendonça França*
+
 
 ## Rails 3.2.7 (Jul 26, 2012) ##
 
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 042ac4e9ee..842f4c23a3 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -82,8 +82,6 @@ module ActionView
       #   # => <input class="ok" onclick="alert('Hello world!');" type="button" value="Greeting" />
       #
       def button_to_function(name, function=nil, html_options={})
-        ActiveSupport::Deprecation.warn("button_to_function is deprecated and will be removed from Rails 4.0")
-
         onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
 
         tag(:input, html_options.merge(:type => 'button', :value => name, :onclick => onclick))
@@ -102,8 +100,6 @@ module ActionView
       #   # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a>
       #
       def link_to_function(name, function, html_options={})
-        ActiveSupport::Deprecation.warn("link_to_function is deprecated and will be removed from Rails 4.0")
-
         onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
         href = html_options[:href] || '#'
 
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index 91968861fa..4b9c3c97b1 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -46,45 +46,33 @@ class JavaScriptHelperTest < ActionView::TestCase
   end
 
   def test_button_to_function
-    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.0" do
-      assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
-        button_to_function("Greeting", "alert('Hello world!')")
-    end
+    assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
+      button_to_function("Greeting", "alert('Hello world!')")
   end
 
   def test_button_to_function_with_onclick
-    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.0" do
-      assert_dom_equal "<input onclick=\"alert('Goodbye World :('); alert('Hello world!');\" type=\"button\" value=\"Greeting\" />",
-        button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
-    end
+    assert_dom_equal "<input onclick=\"alert('Goodbye World :('); alert('Hello world!');\" type=\"button\" value=\"Greeting\" />",
+      button_to_function("Greeting", "alert('Hello world!')", :onclick => "alert('Goodbye World :(')")
   end
 
   def test_button_to_function_without_function
-    assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.0" do
-      assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
-        button_to_function("Greeting")
-    end
+    assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
+      button_to_function("Greeting")
   end
 
   def test_link_to_function
-    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.0" do
-      assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
-        link_to_function("Greeting", "alert('Hello world!')")
-    end
+    assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
+      link_to_function("Greeting", "alert('Hello world!')")
   end
 
   def test_link_to_function_with_existing_onclick
-    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.0" do
-      assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>),
-        link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
-    end
+    assert_dom_equal %(<a href="#" onclick="confirm('Sanity!'); alert('Hello world!'); return false;">Greeting</a>),
+      link_to_function("Greeting", "alert('Hello world!')", :onclick => "confirm('Sanity!')")
   end
 
   def test_function_with_href
-    assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.0" do
-      assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
-        link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
-    end
+    assert_dom_equal %(<a href="http://example.com/" onclick="alert('Hello world!'); return false;">Greeting</a>),
+      link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
   end
 
   def test_javascript_tag
-- 
cgit v1.2.3