diff options
| author | 2022-04-20 00:13:08 -0400 | |
|---|---|---|
| committer | 2022-04-20 00:13:08 -0400 | |
| commit | aca2787b50094a4ab1f17162aa92c5263858743e (patch) | |
| tree | c227d3a22fe454f92162d8d91ecb81f3141ace94 /npm_assets/node_modules/jquery/src/deferred.js | |
| parent | 78e717290e125cab92aef712f12ae63fedb4070f (diff) | |
| parent | 942e313727d1ad886a1024c24fe4a9e8e2e0bb3e (diff) | |
Update upstream source from tag 'upstream/8.2.0'
Update to upstream version '8.2.0'
with Debian dir 65d01d7d78d6b41c0be6eb196ed84354526f9384
Diffstat (limited to 'npm_assets/node_modules/jquery/src/deferred.js')
| -rw-r--r-- | npm_assets/node_modules/jquery/src/deferred.js | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/npm_assets/node_modules/jquery/src/deferred.js b/npm_assets/node_modules/jquery/src/deferred.js index c05a37a..439653f 100644 --- a/npm_assets/node_modules/jquery/src/deferred.js +++ b/npm_assets/node_modules/jquery/src/deferred.js @@ -359,8 +359,8 @@ jQuery.extend( { resolveContexts = Array( i ), resolveValues = slice.call( arguments ), - // the master Deferred - master = jQuery.Deferred(), + // the primary Deferred + primary = jQuery.Deferred(), // subordinate callback factory updateFunc = function( i ) { @@ -368,30 +368,30 @@ jQuery.extend( { resolveContexts[ i ] = this; resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; if ( !( --remaining ) ) { - master.resolveWith( resolveContexts, resolveValues ); + primary.resolveWith( resolveContexts, resolveValues ); } }; }; // Single- and empty arguments are adopted like Promise.resolve if ( remaining <= 1 ) { - adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject, + adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject, !remaining ); // Use .then() to unwrap secondary thenables (cf. gh-3000) - if ( master.state() === "pending" || + if ( primary.state() === "pending" || isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) { - return master.then(); + return primary.then(); } } // Multiple arguments are aggregated like Promise.all array elements while ( i-- ) { - adoptValue( resolveValues[ i ], updateFunc( i ), master.reject ); + adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject ); } - return master.promise(); + return primary.promise(); } } ); |
