aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2021-01-12 20:56:51 +0100
committerGitHub <noreply@github.com>2021-01-12 20:56:51 +0100
commita32cf6324f8f2190e66a687e94be9687ebf840b7 (patch)
treecd6b5f1985b7ff0f2be74610e21da8ce72baf092
parentd38528b17a846b7ca4513b41150a05436546292d (diff)
downloadjquery-a32cf6324f8f2190e66a687e94be9687ebf840b7.tar.gz
jquery-a32cf6324f8f2190e66a687e94be9687ebf840b7.zip
Deferred: Rename master to primary
Closes gh-4828
-rw-r--r--src/deferred.js16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/deferred.js b/src/deferred.js
index d4eaf7a4b..dc4294726 100644
--- a/src/deferred.js
+++ b/src/deferred.js
@@ -353,8 +353,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 ) {
@@ -362,30 +362,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" ||
typeof( resolveValues[ i ] && resolveValues[ i ].then ) === "function" ) {
- 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();
}
} );