mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Added support for the queue option on visual_effect
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
d8f0a3f93c
commit
56ae4ab547
3 changed files with 4 additions and 0 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Added support for the queue option on visual_effect [Thomas Fuchs]
|
||||
|
||||
* Update script.aculo.us to V1.5_rc4 [Thomas Fuchs]
|
||||
|
||||
* Fix that render :text didn't interpolate instance variables #2629, #2626 [skaes]
|
||||
|
|
|
@ -377,6 +377,7 @@ module ActionView
|
|||
# http://script.aculo.us for more documentation.
|
||||
def visual_effect(name, element_id = false, js_options = {})
|
||||
element = element_id ? "'#{element_id}'" : "element"
|
||||
js_options[:queue] = "'#{js_options[:queue]}'" if js_options[:queue]
|
||||
"new Effect.#{name.to_s.camelize}(#{element},#{options_for_javascript(js_options)});"
|
||||
end
|
||||
|
||||
|
|
|
@ -125,6 +125,7 @@ class JavaScriptHelperTest < Test::Unit::TestCase
|
|||
assert_equal "new Effect.Highlight('posts',{});", visual_effect(:highlight, :posts)
|
||||
assert_equal "new Effect.Fade('fademe',{duration:4.0});", visual_effect(:fade, "fademe", :duration => 4.0)
|
||||
assert_equal "new Effect.Shake(element,{});", visual_effect(:shake)
|
||||
assert_equal "new Effect.DropOut('dropme',{queue:'end'});", visual_effect(:drop_out, 'dropme', :queue => :end)
|
||||
end
|
||||
|
||||
def test_sortable_element
|
||||
|
|
Loading…
Reference in a new issue