Commit 3484a68c authored by terrycojones's avatar terrycojones Committed by Oleg

Removed an unneeded variable. Closes gh-1321.

parent 410cf4ee
...@@ -171,3 +171,4 @@ Jason Bedard <jason+jquery@jbedard.ca> ...@@ -171,3 +171,4 @@ Jason Bedard <jason+jquery@jbedard.ca>
Kyle Robinson Young <kyle@dontkry.com> Kyle Robinson Young <kyle@dontkry.com>
Chris Talkington <chris@talkingtontech.com> Chris Talkington <chris@talkingtontech.com>
Jason Merino <jasonmerino@gmail.com> Jason Merino <jasonmerino@gmail.com>
Terry Jones <terry@jon.es>
...@@ -20,8 +20,7 @@ jQuery.extend({ ...@@ -20,8 +20,7 @@ jQuery.extend({
var fns = arguments; var fns = arguments;
return jQuery.Deferred(function( newDefer ) { return jQuery.Deferred(function( newDefer ) {
jQuery.each( tuples, function( i, tuple ) { jQuery.each( tuples, function( i, tuple ) {
var action = tuple[ 0 ], var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
// deferred[ done | fail | progress ] for forwarding actions to newDefer // deferred[ done | fail | progress ] for forwarding actions to newDefer
deferred[ tuple[1] ](function() { deferred[ tuple[1] ](function() {
var returned = fn && fn.apply( this, arguments ); var returned = fn && fn.apply( this, arguments );
...@@ -31,7 +30,7 @@ jQuery.extend({ ...@@ -31,7 +30,7 @@ jQuery.extend({
.fail( newDefer.reject ) .fail( newDefer.reject )
.progress( newDefer.notify ); .progress( newDefer.notify );
} else { } else {
newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
} }
}); });
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment