aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-05-10 11:00:14 -0400
committerScott González <scott.gonzalez@gmail.com>2011-05-10 11:00:14 -0400
commitb546f316bedcb74c507378b1460ed5c87d44e213 (patch)
tree6fd29806561e00e56d16d4da759d3249ce693864 /tests
parent1a974109ef72fcef04a2632594189387102e9778 (diff)
parent126d46c0509ff9b8b5f194b897201458925ace93 (diff)
downloadjquery-ui-b546f316bedcb74c507378b1460ed5c87d44e213.tar.gz
jquery-ui-b546f316bedcb74c507378b1460ed5c87d44e213.zip
Merge remote branch 'gnarf37/ticket-7067'
Diffstat (limited to 'tests')
-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");
+ });
});
};