Showing with 5 additions and 4 deletions.
  1. +1 −0 AUTHORS.txt
  2. +2 −3 src/deferred.js
  3. +2 −1 test/unit/support.js
@@ -171,3 +171,4 @@ Jason Bedard <jason+jquery@jbedard.ca>
Kyle Robinson Young <kyle@dontkry.com>
Chris Talkington <chris@talkingtontech.com>
Jason Merino <jasonmerino@gmail.com>
Terry Jones <terry@jon.es>
@@ -20,8 +20,7 @@ jQuery.extend({
var fns = arguments;
return jQuery.Deferred(function( newDefer ) {
jQuery.each( tuples, function( i, tuple ) {
var action = tuple[ 0 ],
fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
// deferred[ done | fail | progress ] for forwarding actions to newDefer
deferred[ tuple[1] ](function() {
var returned = fn && fn.apply( this, arguments );
@@ -31,7 +30,7 @@ jQuery.extend({
.fail( newDefer.reject )
.progress( newDefer.notify );
} else {
newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
}
});
});
@@ -33,6 +33,7 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
userAgent = window.navigator.userAgent;

if ( /chrome/i.test( userAgent ) ) {
version = userAgent.match( /chrome\/(\d+)/i )[ 1 ];
expected = {
"checkOn":true,
"optSelected":true,
@@ -47,7 +48,7 @@ testIframeWithCallback( "box-sizing does not affect jQuery.support.shrinkWrapBlo
"clearCloneStyle": true,
"boxSizing": true,
"boxSizingReliable": true,
"pixelPosition": false
"pixelPosition": version >= 28
};
} else if ( /opera.*version\/12\.1/i.test( userAgent ) ) {
expected = {