fadeToggle(). as suggested by Karl Swedberg in his jQcon talk. patche…

…d live! omg
jquery · Oct 17, 2010 · 97dfa0d5a85a32fe56aba837bbf2bc889b092d2b · jitter · Oct 17, 2010 · paulirish
1 parent 8a5df39
commit 97dfa0d5a85a32fe56aba837bbf2bc889b092d2b
Unified Split

Showing with 12 additions and 1 deletion.

+2 −1 src/effects.js

+3 −0 test/index.html

+7 −0 test/unit/effects.js
diff --git a/src/effects.js b/src/effects.js
@@ -252,7 +252,8 @@ jQuery.each({
 	slideUp: genFx("hide", 1),
 	slideToggle: genFx("toggle", 1),
 	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" }
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
 }, function( name, props ) {
 	jQuery.fn[ name ] = function( speed, easing, callback ) {
 		return this.animate( props, speed, easing, callback );

diff --git a/test/index.html b/test/index.html
@@ -259,6 +259,9 @@ <h2 id="qunit-userAgent"></h2>
 
 			<div id="slidetogglein" class='chain test'>slideToggleIn<div>slideToggleIn</div></div>
 			<div id="slidetoggleout" class='chain test out'>slideToggleOut<div>slideToggleOut</div></div>
+
+			<div id="fadetogglein" class='chain test'>fadeToggleIn<div>fadeToggleIn</div></div>
+      <div id="fadetoggleout" class='chain test out'>fadeToggleOut<div>fadeToggleOut</div></div>
 
 			<div id="fadeto" class='chain test'>fadeTo<div>fadeTo</div></div>
 		</div>

diff --git a/test/unit/effects.js b/test/unit/effects.js
@@ -729,6 +729,13 @@ test("Chain slideToggle out", function() {
 	jQuery('#slidetoggleout div').saveState(jQuery.support.shrinkWrapBlocks).slideToggle('fast').slideToggle('fast',jQuery.checkState);
 });
 
+test("Chain fadeToggle in", function() {
+	jQuery('#fadetogglein div').saveState().fadeToggle('fast').fadeToggle('fast',jQuery.checkState);
+});
+test("Chain fadeToggle out", function() {
+	jQuery('#fadetoggleout div').saveState().fadeToggle('fast').fadeToggle('fast',jQuery.checkState);
+});
+
 test("Chain fadeTo 0.5 1.0 with easing and callback)", function() {
 	jQuery('#fadeto div').saveState().fadeTo('fast',0.5).fadeTo('fast',1.0,'linear',jQuery.checkState);
 });