mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Improve the deprecation message of link_to_function and
button_to_function Point the the Unobtrusive JavaScript secion in the JavaScript guide
This commit is contained in:
parent
028f29dc91
commit
a4c3d5ae1d
2 changed files with 10 additions and 8 deletions
|
@ -78,7 +78,8 @@ module ActionView
|
|||
# # => <input class="ok" onclick="alert('Hello world!');" type="button" value="Greeting" />
|
||||
#
|
||||
def button_to_function(name, function=nil, html_options={})
|
||||
message = "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead."
|
||||
message = "button_to_function is deprecated and will be removed from Rails 4.1. We recomend to use Unobtrusive JavaScript instead. " +
|
||||
"See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
|
||||
ActiveSupport::Deprecation.warn message
|
||||
|
||||
onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function};"
|
||||
|
@ -99,7 +100,8 @@ module ActionView
|
|||
# # => <a class="nav_link" href="#" onclick="alert('Hello world!'); return false;">Greeting</a>
|
||||
#
|
||||
def link_to_function(name, function, html_options={})
|
||||
message = "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead."
|
||||
message = "link_to_function is deprecated and will be removed from Rails 4.1. We recomend to use Unobtrusive JavaScript instead. " +
|
||||
"See http://guides.rubyonrails.org/working_with_javascript_in_rails.html#unobtrusive-javascript"
|
||||
ActiveSupport::Deprecation.warn message
|
||||
|
||||
onclick = "#{"#{html_options[:onclick]}; " if html_options[:onclick]}#{function}; return false;"
|
||||
|
|
|
@ -43,42 +43,42 @@ class JavaScriptHelperTest < ActionView::TestCase
|
|||
end
|
||||
|
||||
def test_button_to_function
|
||||
assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
|
||||
assert_deprecated do
|
||||
assert_dom_equal %(<input type="button" onclick="alert('Hello world!');" value="Greeting" />),
|
||||
button_to_function("Greeting", "alert('Hello world!')")
|
||||
end
|
||||
end
|
||||
|
||||
def test_button_to_function_with_onclick
|
||||
assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
|
||||
assert_deprecated 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
|
||||
end
|
||||
|
||||
def test_button_to_function_without_function
|
||||
assert_deprecated "button_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
|
||||
assert_deprecated do
|
||||
assert_dom_equal "<input onclick=\";\" type=\"button\" value=\"Greeting\" />",
|
||||
button_to_function("Greeting")
|
||||
end
|
||||
end
|
||||
|
||||
def test_link_to_function
|
||||
assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
|
||||
assert_deprecated do
|
||||
assert_dom_equal %(<a href="#" onclick="alert('Hello world!'); return false;">Greeting</a>),
|
||||
link_to_function("Greeting", "alert('Hello world!')")
|
||||
end
|
||||
end
|
||||
|
||||
def test_link_to_function_with_existing_onclick
|
||||
assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
|
||||
assert_deprecated 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
|
||||
end
|
||||
|
||||
def test_function_with_href
|
||||
assert_deprecated "link_to_function is deprecated and will be removed from Rails 4.1. Use Unobtrusive JavaScript instead." do
|
||||
assert_deprecated 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
|
||||
|
|
Loading…
Reference in a new issue