Skip to content

Commit 7e239e2

Browse files
committed
Merge remote branch 'gnarf37/effects-visual-test'
2 parents b546f31 + d4bdd19 commit 7e239e2

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

tests/visual/effects.all.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@
145145
</div>
146146
</li>
147147

148+
<li>
149+
<div class="effect" id="size">
150+
<p>Size Default Show/Hide</p>
151+
</div>
152+
</li>
153+
154+
<li>
155+
<div class="effect" id="sizeToggle">
156+
<p>Size Toggle</p>
157+
</div>
158+
</li>
159+
148160
<li>
149161
<div class="effect" id="slideDown">
150162
<p>Slide down</p>

tests/visual/effects.all.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ $(function() {
3030
var el = $(this);
3131
el.addClass("current").hide(duration, function() {
3232
setTimeout(function() {
33-
el.show(duration, function() { el.removeClass("current") });
33+
el.show(duration, function() { el.removeClass("current"); });
3434
}, wait);
35-
})
36-
})
35+
});
36+
});
3737

3838
effect("#blindLeft", "blind", { direction: "left" });
3939
effect("#blindUp", "blind", { direction: "up" });
@@ -63,6 +63,16 @@ $(function() {
6363

6464
effect("#puff", "puff", { times: 2 });
6565
effect("#scale", "scale", {});
66+
effect("#size", "size", {});
67+
$("#sizeToggle").bind("click", function() {
68+
var opts = { to: { width: 300, height: 300 }};
69+
$(this).addClass('current')
70+
.toggle("size", opts, duration)
71+
.delay(wait)
72+
.toggle("size", opts, duration, function() {
73+
$(this).removeClass("current");
74+
});
75+
});
6676

6777
$("#shake").bind("click", function() { $(this).addClass("current").effect("shake", {}, 100, function() { $(this).removeClass("current"); }); });
6878

@@ -84,13 +94,13 @@ $(function() {
8494
$("#removeClass").click(function() {
8595
$(this).addClass("current").removeClass(function() {
8696
window.console && console.log(arguments);
87-
return "current"
97+
return "current";
8898
}, duration);
8999
});
90100
$("#toggleClass").click(function() {
91101
$(this).toggleClass(function() {
92102
window.console && console.log(arguments);
93-
return "current"
103+
return "current";
94104
}, duration);
95105
});
96106
});

0 commit comments

Comments
 (0)