Merge remote branch 'gnarf37/effects-visual-test'

This commit is contained in:
Scott González 2011-05-10 11:11:33 -04:00
commit 7e239e2ab2
2 changed files with 27 additions and 5 deletions

View File

@ -145,6 +145,18 @@
</div>
</li>
<li>
<div class="effect" id="size">
<p>Size Default Show/Hide</p>
</div>
</li>
<li>
<div class="effect" id="sizeToggle">
<p>Size Toggle</p>
</div>
</li>
<li>
<div class="effect" id="slideDown">
<p>Slide down</p>

View File

@ -30,10 +30,10 @@ $(function() {
var el = $(this);
el.addClass("current").hide(duration, function() {
setTimeout(function() {
el.show(duration, function() { el.removeClass("current") });
el.show(duration, function() { el.removeClass("current"); });
}, wait);
})
})
});
});
effect("#blindLeft", "blind", { direction: "left" });
effect("#blindUp", "blind", { direction: "up" });
@ -63,6 +63,16 @@ $(function() {
effect("#puff", "puff", { times: 2 });
effect("#scale", "scale", {});
effect("#size", "size", {});
$("#sizeToggle").bind("click", function() {
var opts = { to: { width: 300, height: 300 }};
$(this).addClass('current')
.toggle("size", opts, duration)
.delay(wait)
.toggle("size", opts, duration, function() {
$(this).removeClass("current");
});
});
$("#shake").bind("click", function() { $(this).addClass("current").effect("shake", {}, 100, function() { $(this).removeClass("current"); }); });
@ -84,13 +94,13 @@ $(function() {
$("#removeClass").click(function() {
$(this).addClass("current").removeClass(function() {
window.console && console.log(arguments);
return "current"
return "current";
}, duration);
});
$("#toggleClass").click(function() {
$(this).toggleClass(function() {
window.console && console.log(arguments);
return "current"
return "current";
}, duration);
});
});