diff options
| author | gnarf <gnarf@gnarf.net> | 2011-05-01 06:26:43 -0500 |
|---|---|---|
| committer | gnarf <gnarf@gnarf.net> | 2011-05-01 06:26:43 -0500 |
| commit | c5c65dbac60463d04a6c34a3c0e3e9ce5a846a43 (patch) | |
| tree | b15f5c78af1bdc0ab21ce95c5068d1c6ed8ccfd7 | |
| parent | 1eada2154910102e4c39d131a23af24ad0d92815 (diff) | |
| parent | 321fd390579d38641c7adc0fa1ebe988bca3fde5 (diff) | |
| download | jquery-ui-c5c65dbac60463d04a6c34a3c0e3e9ce5a846a43.tar.gz jquery-ui-c5c65dbac60463d04a6c34a3c0e3e9ce5a846a43.zip | |
Merge branch 'ticket-7067' into effects-unit
Conflicts:
ui/jquery.effects.pulsate.js
| -rw-r--r-- | tests/visual/effects.all.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/visual/effects.all.js b/tests/visual/effects.all.js index 5e47a4f48..f678c6276 100644 --- a/tests/visual/effects.all.js +++ b/tests/visual/effects.all.js @@ -14,12 +14,14 @@ $(function() { $(el).bind("click", function() { - $(this).addClass("current").hide(n, o, duration, function() { - var self = this; - window.setTimeout(function() { - $(self).show(n, o, duration, function() { $(this).removeClass("current"); }); - }, wait); - }); + $(this).addClass("current") + // delaying the initial animation makes sure that the queue stays in tact + .delay( 10 ) + .hide( n, o, duration ) + .delay( wait ) + .show( n, o, duration, function() { + $( this ).removeClass("current"); + }); }); }; |