Merge branch 'ticket-7067' into effects-unit

Conflicts:
	ui/jquery.effects.pulsate.js
This commit is contained in:
gnarf 2011-05-01 06:26:43 -05:00
commit c5c65dbac6

View File

@ -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");
});
});
};