github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-01 21:45:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Deferred: Make jQuery.when synchronous when possible

Browse Source 
Closes gh-3102
Fixes gh-3100
Closes gh-3105
This commit is contained in:
Richard Gibson
2016-05-04 15:30:24 -04:00
parent e8825a529b
commit de71e9755f
2 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/deferred.js
View File

@@ -366,16 +366,21 @@ jQuery.extend( {
// Single- and empty arguments are adopted like Promise.resolve
if ( remaining <= 1 ) {
adoptValue( singleValue, master.resolve, master.reject );
adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject );
// Use .then() to unwrap secondary thenables (cf. gh-3000)
return master.then();
if ( master.state() === "pending" ||
jQuery.isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
return master.then();
}
}
// Multiple arguments are aggregated like Promise.all array elements
while ( i-- ) {
adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
}
return master.promise();
}
} );