diff options
author | Thomas Fuchs <thomas@fesch.at> | 2006-09-07 09:19:35 +0000 |
---|---|---|
committer | Thomas Fuchs <thomas@fesch.at> | 2006-09-07 09:19:35 +0000 |
commit | 8734da9bca3db5934f0d072feeca0b1724d082a7 (patch) | |
tree | 87e74e5a54561e3fd0aa6b46a04baa98ff0d5ec6 /actionpack | |
parent | 00685ad8fdc9f15d935aebe52597037f3ca93be8 (diff) | |
download | rails-8734da9bca3db5934f0d072feeca0b1724d082a7.tar.gz rails-8734da9bca3db5934f0d072feeca0b1724d082a7.tar.bz2 rails-8734da9bca3db5934f0d072feeca0b1724d082a7.zip |
Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids, fixes #6068 [petermichaux@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 16 | ||||
-rw-r--r-- | actionpack/test/template/prototype_helper_test.rb | 17 |
3 files changed, 26 insertions, 9 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 063e407210..99005e9a2c 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Update JavaScriptGenerator#show/hide/toggle/remove to new Prototype syntax for multiple ids, #6068 [petermichaux@gmail.com] + * Update UrlWriter to support :only_path. [Nicholas Seckar, Dave Thomas] * Fixed JavaScriptHelper#link_to_function and JavaScriptHelper#button_to_function to have the script argument be optional [DHH]. So what used to require a nil, like this: diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 1f547d4809..b6f811aee1 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -556,22 +556,22 @@ module ActionView # Removes the DOM elements with the given +ids+ from the page. def remove(*ids) - record "#{javascript_object_for(ids)}.each(Element.remove)" + loop_on_multiple_args 'Element.remove', ids end # Shows hidden DOM elements with the given +ids+. def show(*ids) - call 'Element.show', *ids + loop_on_multiple_args 'Element.show', ids end # Hides the visible DOM elements with the given +ids+. def hide(*ids) - call 'Element.hide', *ids + loop_on_multiple_args 'Element.hide', ids end # Toggles the visibility of the DOM elements with the given +ids+. def toggle(*ids) - call 'Element.toggle', *ids + loop_on_multiple_args 'Element.toggle', ids end # Displays an alert dialog with the given +message+. @@ -684,6 +684,14 @@ module ActionView end protected + def loop_on_multiple_args(method, ids) + record (if ids.size>1 + "#{javascript_object_for(ids)}.each(#{method})" + else + "#{method}(#{ids.first.to_json})" + end) + end + def options_for_ajax(options) js_options = build_callbacks(options) diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb index 3954e38dcd..413999d85c 100644 --- a/actionpack/test/template/prototype_helper_test.rb +++ b/actionpack/test/template/prototype_helper_test.rb @@ -203,7 +203,7 @@ class JavaScriptGeneratorTest < Test::Unit::TestCase end def test_remove - assert_equal '["foo"].each(Element.remove);', + assert_equal 'Element.remove("foo");', @generator.remove('foo') assert_equal '["foo", "bar", "baz"].each(Element.remove);', @generator.remove('foo', 'bar', 'baz') @@ -212,17 +212,24 @@ class JavaScriptGeneratorTest < Test::Unit::TestCase def test_show assert_equal 'Element.show("foo");', @generator.show('foo') - assert_equal 'Element.show("foo", "bar", "baz");', - @generator.show('foo', 'bar', 'baz') + assert_equal '["foo", "bar", "baz"].each(Element.show);', + @generator.show('foo', 'bar', 'baz') end def test_hide assert_equal 'Element.hide("foo");', @generator.hide('foo') - assert_equal 'Element.hide("foo", "bar", "baz");', - @generator.hide('foo', 'bar', 'baz') + assert_equal '["foo", "bar", "baz"].each(Element.hide);', + @generator.hide('foo', 'bar', 'baz') end + def test_toggle + assert_equal 'Element.toggle("foo");', + @generator.toggle('foo') + assert_equal '["foo", "bar", "baz"].each(Element.toggle);', + @generator.toggle('foo', 'bar', 'baz') + end + def test_alert assert_equal 'alert("hello");', @generator.alert('hello') end |