Skip to content

Commit 97dfa0d

Browse files
committed
fadeToggle(). as suggested by Karl Swedberg in his jQcon talk. patched live! omg
1 parent 8a5df39 commit 97dfa0d

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

src/effects.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@ jQuery.each({
252252
slideUp: genFx("hide", 1),
253253
slideToggle: genFx("toggle", 1),
254254
fadeIn: { opacity: "show" },
255-
fadeOut: { opacity: "hide" }
255+
fadeOut: { opacity: "hide" },
256+
fadeToggle: { opacity: "toggle" }
256257
}, function( name, props ) {
257258
jQuery.fn[ name ] = function( speed, easing, callback ) {
258259
return this.animate( props, speed, easing, callback );

test/index.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,9 @@ <h2 id="qunit-userAgent"></h2>
259259

260260
<div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
261261
<div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
262+
263+
<div id="fadetogglein" class='chain test'>fadeToggleIn<div>fadeToggleIn</div></div>
264+
<div id="fadetoggleout" class='chain test out'>fadeToggleOut<div>fadeToggleOut</div></div>
262265

263266
<div id="fadeto" class='chain test'>fadeTo<div>fadeTo</div></div>
264267
</div>

test/unit/effects.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -729,6 +729,13 @@ test("Chain slideToggle out", function() {
729729
jQuery('#slidetoggleout div').saveState(jQuery.support.shrinkWrapBlocks).slideToggle('fast').slideToggle('fast',jQuery.checkState);
730730
});
731731

732+
test("Chain fadeToggle in", function() {
733+
jQuery('#fadetogglein div').saveState().fadeToggle('fast').fadeToggle('fast',jQuery.checkState);
734+
});
735+
test("Chain fadeToggle out", function() {
736+
jQuery('#fadetoggleout div').saveState().fadeToggle('fast').fadeToggle('fast',jQuery.checkState);
737+
});
738+
732739
test("Chain fadeTo 0.5 1.0 with easing and callback)", function() {
733740
jQuery('#fadeto div').saveState().fadeTo('fast',0.5).fadeTo('fast',1.0,'linear',jQuery.checkState);
734741
});

0 commit comments

Comments
 (0)