diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index d23d46e2bb..9a7759cb23 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -10,7 +10,7 @@ page.select('p.welcome b').first # => $$('p.welcome b').first(); page.select('p.welcome b').first.hide # => $$('p.welcome b').first().hide(); -* Add JavaScriptGenerator#replace_element for replacing an element's "outer HTML". #3246 [tom@craz8.com, Sam Stephenson] +* Add JavaScriptGenerator#replace for replacing an element's "outer HTML". #3246 [tom@craz8.com, Sam Stephenson] * Remove over-engineered form_for code for a leaner implementation. [Nicholas Seckar] diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index ae68e21624..a953eab659 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -488,7 +488,7 @@ module ActionView # replace_html 'person-45', :partial => 'person', :object => @person # # This allows the same partial that is used for the +insert_html+ to - # be also used for the input to +replace_element+ without resorting to + # be also used for the input to +replace+ without resorting to # the use of wrapper elements. # # Examples: diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb index 6ce8380a69..fc8961f02a 100644 --- a/actionpack/test/template/prototype_helper_test.rb +++ b/actionpack/test/template/prototype_helper_test.rb @@ -173,7 +173,7 @@ class JavaScriptGeneratorTest < Test::Unit::TestCase def test_replace_element_with_string assert_equal 'Element.replace("element", "

This is a test

");', - @generator.replace_element('element', '

This is a test

') + @generator.replace('element', '

This is a test

') end def test_remove