aboutsummaryrefslogtreecommitdiffstats
path: root/tests/visual/effects.all.js
diff options
context:
space:
mode:
authorJörn Zaefferer <joern.zaefferer@gmail.com>2011-05-10 17:10:45 +0200
committerJörn Zaefferer <joern.zaefferer@gmail.com>2011-05-10 17:10:45 +0200
commit1426f7edf31f69482a86ac4bca81110cf42f25c6 (patch)
treeb5e7b3943495cd8aa21b82b6560e3524e6c1c54e /tests/visual/effects.all.js
parent5806d6554bfadc4500e97d57d07d6f44d2b90618 (diff)
parentb546f316bedcb74c507378b1460ed5c87d44e213 (diff)
downloadjquery-ui-1426f7edf31f69482a86ac4bca81110cf42f25c6.tar.gz
jquery-ui-1426f7edf31f69482a86ac4bca81110cf42f25c6.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'tests/visual/effects.all.js')
-rw-r--r--tests/visual/effects.all.js14
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/visual/effects.all.js b/tests/visual/effects.all.js
index 3ac8968b3..9cf7487c9 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");
+ });
});
};