Effects: Use showHide directly

gibson042 · gibson042 · commit 351092ff51e0 · 2015-04-06T12:03:41.000-04:00
diff --git a/src/css.js b/src/css.js
@@ -12,14 +12,14 @@ define([
 	"./css/adjustCSS",
 	"./css/addGetHookIf",
 	"./css/support",
-	"./data/var/dataPriv",
+	"./css/showHide",
 
 	"./core/init",
 	"./css/swap",
 	"./core/ready",
 	"./selector" // contains
 ], function( jQuery, pnum, access, rmargin, rcssNum, rnumnonpx, cssExpand, isHidden,
-	getStyles, curCSS, adjustCSS, addGetHookIf, support, dataPriv ) {
+	getStyles, curCSS, adjustCSS, addGetHookIf, support, showHide ) {
 
 var
 	// Swappable if display is none or starts with table
@@ -150,46 +150,6 @@ function getWidthOrHeight( elem, name, extra ) {
 	) + "px";
 }
 
-function showHide( elements, show ) {
-	var display, elem,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	// Determine new display value for elements that need to change
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		display = elem.style.display;
-		if ( show ) {
-			if ( display === "none" ) {
-				// Restore a pre-hide() value if we have one
-				values[ index ] = dataPriv.get( elem, "olddisplay" ) || "";
-			}
-		} else {
-			if ( display !== "none" ) {
-				values[ index ] = "none";
-
-				// Remember the value we're replacing
-				dataPriv.set( elem, "olddisplay", display );
-			}
-		}
-	}
-
-	// Set the display of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		if ( values[ index ] != null ) {
-			elements[ index ].style.display = values[ index ];
-		}
-	}
-
-	return elements;
-}
-
 jQuery.extend({
 
 	// Add in style property hooks for overriding the default
diff --git a/src/css/showHide.js b/src/css/showHide.js
@@ -0,0 +1,47 @@
+define([
+	"../data/var/dataPriv"
+], function( dataPriv ) {
+
+function showHide( elements, show ) {
+	var display, elem,
+		values = [],
+		index = 0,
+		length = elements.length;
+
+	// Determine new display value for elements that need to change
+	for ( ; index < length; index++ ) {
+		elem = elements[ index ];
+		if ( !elem.style ) {
+			continue;
+		}
+
+		display = elem.style.display;
+		if ( show ) {
+			if ( display === "none" ) {
+				// Restore a pre-hide() value if we have one
+				values[ index ] = dataPriv.get( elem, "olddisplay" ) || "";
+			}
+		} else {
+			if ( display !== "none" ) {
+				values[ index ] = "none";
+
+				// Remember the value we're replacing
+				dataPriv.set( elem, "olddisplay", display );
+			}
+		}
+	}
+
+	// Set the display of the elements in a second loop
+	// to avoid the constant reflow
+	for ( index = 0; index < length; index++ ) {
+		if ( values[ index ] != null ) {
+			elements[ index ].style.display = values[ index ];
+		}
+	}
+
+	return elements;
+}
+
+return showHide;
+
+});
diff --git a/src/effects.js b/src/effects.js
@@ -6,6 +6,7 @@ define([
 	"./css/var/isHidden",
 	"./css/adjustCSS",
 	"./data/var/dataPriv",
+	"./css/showHide",
 
 	"./core/init",
 	"./queue",
@@ -14,7 +15,7 @@ define([
 	"./manipulation",
 	"./css",
 	"./effects/Tween"
-], function( jQuery, document, rcssNum, cssExpand, isHidden, adjustCSS, dataPriv ) {
+], function( jQuery, document, rcssNum, cssExpand, isHidden, adjustCSS, dataPriv, showHide ) {
 
 var
 	fxNow, timerId,
@@ -117,7 +118,7 @@ function defaultPrefilter( elem, props, opts ) {
 	// Detect show/hide animations
 	for ( prop in props ) {
 		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
+		if ( rfxtypes.test( value ) ) {
 			delete props[ prop ];
 			toggle = toggle || value === "toggle";
 			if ( value === ( hidden ? "hide" : "show" ) ) {
@@ -210,14 +211,14 @@ function defaultPrefilter( elem, props, opts ) {
 
 			// Show elements before animating them
 			if ( hidden ) {
-				jQuery( elem ).show();
+				showHide( [ elem ], true );
 			}
 
 			/* jshint -W083 */
 			anim.done(function() {
 				// The final step of a "hide" animation is actually hiding the element
 				if ( !hidden ) {
-					jQuery( elem ).hide();
+					showHide( [ elem ] );
 				}
 				dataPriv.remove( elem, "fxshow" );
 				for ( prop in orig ) {
