From 6c4ca13d693663cdd124d4d29cb12897a6debc5e Mon Sep 17 00:00:00 2001
From: Corey Frang <gnarf@gnarf.net>
Date: Tue, 11 Oct 2011 21:21:59 -0400
Subject: [PATCH] Squashed commit of the following:

commit af3fd32f207ed080084f10d76f89c07c414baa05
Merge: 83c08ff fdd60f8
Author: Dave Methvin <dave.methvin@gmail.com>
Date:   Tue Oct 11 21:17:56 2011 -0400

    Merge branch 'stop' of https://github.com/gnarf37/jquery into pull-541-stop

commit fdd60f8705e98430df62196f505cb929b2d7f6bc
Author: Corey Frang <gnarf@gnarf.net>
Date:   Mon Oct 10 13:51:59 2011 -0500

    .stop( [queue,] clearQueue, gotoEnd )
---
 src/effects.js       | 7 ++++++-
 test/unit/effects.js | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/effects.js b/src/effects.js
index 147763d63..9be9293e5 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -248,7 +248,12 @@ jQuery.fn.extend({
 			this.queue( optall.queue, doAnimation );
 	},
 
-	stop: function( clearQueue, gotoEnd, type ) {
+	stop: function( type, clearQueue, gotoEnd ) {
+		if ( typeof type !== "string" ) {
+			gotoEnd = clearQueue;
+			clearQueue = type;
+			type = undefined;
+		}
 		if ( clearQueue && type !== false ) {
 			this.queue( type || "fx", [] );
 		}
diff --git a/test/unit/effects.js b/test/unit/effects.js
index 4b565a2d1..b52e2414f 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -659,7 +659,7 @@ test("stop(clearQueue, gotoEnd)", function() {
 	}, 100);
 });
 
-asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
+asyncTest( "stop( queue, ..., ... ) - Stop single queues", function() {
 	expect( 3 );
 	var foo = jQuery( "#foo" ),
 		saved;
@@ -681,7 +681,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
 	},{
 		duration: 1000,
 		queue: "height"
-	}).dequeue( "height" ).stop( false, true, "height" );
+	}).dequeue( "height" ).stop( "height", false, true );
 
 	equals( foo.height(), 400, "Height was stopped with gotoEnd" );
 
@@ -690,7 +690,7 @@ asyncTest( "stop( ..., ..., queue ) - Stop single queues", function() {
 	},{
 		duration: 1000,
 		queue: "height"
-	}).dequeue( "height" ).stop( false, false, "height" );
+	}).dequeue( "height" ).stop( "height", false, false );
 	saved = foo.height();
 });