Effects.*: Updating Effect Method API to avoid duplicating the queue call - Fixes #7318 - Add the queue functions to $.fn.effect()

1 files changed, 44 insertions, 49 deletions

diff --git a/ui/jquery.effects.clip.js b/ui/jquery.effects.clip.js
index dbf0d36c9..8c5c76e8c 100644
--- a/ui/jquery.effects.clip.js
+++ b/ui/jquery.effects.clip.js
@@ -12,61 +12,56 @@
  */
 (function( $, undefined ) {
 
-$.effects.effect.clip = function( o ) {
+$.effects.effect.clip = function( o, next ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "vertical",
+		vert = direction === "vertical",
+		size = vert ? "height" : "width",
+		position = vert ? "top" : "left",
+		animation = {},
+		wrapper, animate, distance;
 
-	return this.queue( function() {
+	// Save & Show
+	$.effects.save( el, props );
+	el.show();
 
-		// Create element
-		var el = $( this ),
-			props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
-			mode = $.effects.setMode( el, o.mode || "hide" ),
-			show = mode === "show",
-			direction = o.direction || "vertical",
-			vert = direction === "vertical",
-			size = vert ? "height" : "width",
-			position = vert ? "top" : "left",
-			animation = {},
-			wrapper, animate, distance;
-
-		// Save & Show
-		$.effects.save( el, props );
-		el.show();
-
-		// Create Wrapper
-		wrapper = $.effects.createWrapper( el ).css({
-			overflow: "hidden"
-		});
-		animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
-		distance = animate[ size ]();
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
+	distance = animate[ size ]();
 
-		// Shift
-		if ( show ) {
-			animate.css( size, 0 );
-			animate.css( position, distance / 2 );
-		}
+	// Shift
+	if ( show ) {
+		animate.css( size, 0 );
+		animate.css( position, distance / 2 );
+	}
 
-		// Create Animation Object:
-		animation[ size ] = show ? distance : 0;
-		animation[ position ] = show ? 0 : distance / 2;
+	// Create Animation Object:
+	animation[ size ] = show ? distance : 0;
+	animation[ position ] = show ? 0 : distance / 2;
 
-		// Animate
-		animate.animate( animation, {
-			queue: false,
-			duration: o.duration,
-			easing: o.easing,
-			complete: function() {
-				if ( !show ) {
-					el.hide();
-				}
-				$.effects.restore( el, props );
-				$.effects.removeWrapper( el );
-				if ( $.isFunction( o.complete ) ) {
-					o.complete.apply( el[ 0 ], arguments );
-				}
-				el.dequeue();
+	// Animate
+	animate.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( !show ) {
+				el.hide();
 			}
-		});
-
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			if ( $.isFunction( o.complete ) ) {
+				o.complete.apply( el[ 0 ], arguments );
+			}
+			el.dequeue();
+		}
 	});
 
 };