Ticket #3323: visual_effect_with_toggle.diff
| File visual_effect_with_toggle.diff, 1.9 kB (added by jonathan@bluewire.net.nz, 3 years ago) |
|---|
-
actionpack/test/template/scriptaculous_helper_test.rb
old new 28 28 assert_equal "new Effect.Fade('fademe',{duration:4.0});", visual_effect(:fade, "fademe", :duration => 4.0) 29 29 assert_equal "new Effect.Shake(element,{});", visual_effect(:shake) 30 30 assert_equal "new Effect.DropOut('dropme',{queue:'end'});", visual_effect(:drop_out, 'dropme', :queue => :end) 31 32 assert_equal "Effect.Toggle('posts')", visual_effect(:toggle, "posts") 33 assert_equal "Effect.Toggle('posts','slide')", visual_effect(:toggle, "posts", :effect => "slide") 34 assert_equal "Effect.Toggle('comment','blind')", visual_effect(:toggle, 'comment', :effect => :blind) 31 35 end 32 36 33 37 def test_parallel_effects -
actionpack/lib/action_view/helpers/scriptaculous_helper.rb
old new 36 36 def visual_effect(name, element_id = false, js_options = {}) 37 37 element = element_id ? "'#{element_id}'" : "element" 38 38 js_options[:queue] = "'#{js_options[:queue]}'" if js_options[:queue] 39 "new Effect.#{name.to_s.camelize}(#{element},#{options_for_javascript(js_options)});" 39 js_options.delete(:effect) unless name == :toggle 40 name == :toggle ? 41 "Effect.#{name.to_s.camelize}(#{element}#{",'#{js_options[:effect]}'" if js_options[:effect]})" : 42 "new Effect.#{name.to_s.camelize}(#{element},#{options_for_javascript(js_options)});" 40 43 end 41 44 42 45 # Needs more work so + isn't required for concation of effects. Currently, you have to do:
