Permalink
Browse files

Revert "Deprecate link_to_function and button_to_function helpers"

This reverts commit 9dc57fe.
  • Loading branch information...
rafaelfranca committed Aug 1, 2012
1 parent e826a5c commit f50a5d2eee6ffba0918bfe6a11b99f1f9fa6c58f
View
@@ -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) ##
@@ -82,8 +82,6 @@ def javascript_cdata_section(content) #:nodoc:
# # => <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 @@ def button_to_function(name, function=nil, html_options={})
# # => <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] || '#'
@@ -46,45 +46,33 @@ def test_escape_javascript_with_safebuffer
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

0 comments on commit f50a5d2

Please sign in to comment.