Effects Rewrite: extract "unshift" method for reuse

Author: mikesherov

ui/effect-bounce.js

@@ -45,10 +45,6 @@ return $.effects.define( "bounce", function( o, done ) {
 		motion = ( direction === "up" || direction === "left" ),
 		i = 0,
 
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length,
-
 		placeholder = $.effects.createPlaceholder( el ),
 		refValue = el.css( ref );
 
@@ -104,13 +100,7 @@ return $.effects.define( "bounce", function( o, done ) {
 		done();
 	});
 
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
+	$.effects.unshift( el, anims + 1 );
 });
 
 }));

ui/effect-fold.js

@@ -46,11 +46,7 @@ return $.effects.define( "fold", "hide", function( o, done ) {
 			clip: el.cssClip()
 		},
 
-		distance = [ start[ref[0]], start[ref[1]] ],
-
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length;
+		distance = [ start[ref[0]], start[ref[1]] ];
 
 	// define animations
 	if ( percent ) {
@@ -92,12 +88,7 @@ return $.effects.define( "fold", "hide", function( o, done ) {
 			done();
 		});
 
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, 4 ) ) );
-	}
-	el.dequeue();
+	$.effects.unshift( el, 4 );
 });
 
 }));

ui/effect-pulsate.js

@@ -34,26 +34,20 @@ return $.effects.define( "pulsate", "show", function( o, done ) {
 		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
 		duration = o.duration / anims,
 		animateTo = 0,
-		queue = elem.queue(),
-		queuelen = queue.length,
 		i = 1;
 
-	if ( show || !elem.is(":visible")) {
+	if ( show || !elem.is( ":visible" ) ) {
 		elem.css( "opacity", 0 ).show();
 		animateTo = 1;
 	}
 
 	// anims - 1 opacity "toggles"
 	for ( ; i < anims; i++ ) {
-		elem.animate({
-			opacity: animateTo
-		}, duration, o.easing );
+		elem.animate( { opacity: animateTo }, duration, o.easing );
 		animateTo = 1 - animateTo;
 	}
 
-	elem.animate({
-		opacity: animateTo
-	}, duration, o.easing);
+	elem.animate( { opacity: animateTo }, duration, o.easing);
 
 	elem.queue(function() {
 		if ( hide ) {
@@ -63,12 +57,7 @@ return $.effects.define( "pulsate", "show", function( o, done ) {
 		done();
 	});
 
-	// We just queued up "anims" animations, we need to put them next in the queue
-	if ( queuelen > 1 ) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	elem.dequeue();
+	$.effects.unshift( elem, anims + 1 );
 });
 
 }));

ui/effect-shake.js

@@ -37,9 +37,6 @@ return $.effects.define( "shake", function( o, done ) {
 		animation = {},
 		animation1 = {},
 		animation2 = {},
-		// we will need to re-assemble the queue to stack our animations in place
-		queue = el.queue(),
-		queuelen = queue.length,
 		placeholder = $.effects.createPlaceholder( el );
 
 	// Animation
@@ -69,13 +66,7 @@ return $.effects.define( "shake", function( o, done ) {
 			done();
 		});
 
-	// inject all the animations we just queued to be first in line (after "inprogress")
-	if ( queuelen > 1) {
-		queue.splice.apply( queue,
-			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
-	}
-	el.dequeue();
-
+	$.effects.unshift( el, anims + 1 );
 });
 
 }));

ui/effect.js

@@ -1059,6 +1059,18 @@ $.extend( $.effects, {
 		};
 	},
 
+	// Injects recently queued functions to be first in line (after "inprogress")
+	unshift: function( el, count ) {
+		var queue = el.queue(),
+				queuelen = queue.length;
+
+		if ( queuelen > count + 1 ) {
+			queue.splice.apply( queue,
+				[ 1, 0 ].concat( queue.splice( queuelen, count ) ) );
+		}
+		el.dequeue();
+	},
+
 	saveStyle: function( element ) {
 		element.data( dataSpaceStyle, element[ 0 ].style.cssText );
 	},