Skip to content

Commit 15b62a2

Browse files
committed
Deferred: Rename master to primary
Closes gh-4828 (cherry picked from a32cf63)
1 parent 7298e04 commit 15b62a2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/deferred.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -359,39 +359,39 @@ jQuery.extend( {
359359
resolveContexts = Array( i ),
360360
resolveValues = slice.call( arguments ),
361361

362-
// the master Deferred
363-
master = jQuery.Deferred(),
362+
// the primary Deferred
363+
primary = jQuery.Deferred(),
364364

365365
// subordinate callback factory
366366
updateFunc = function( i ) {
367367
return function( value ) {
368368
resolveContexts[ i ] = this;
369369
resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
370370
if ( !( --remaining ) ) {
371-
master.resolveWith( resolveContexts, resolveValues );
371+
primary.resolveWith( resolveContexts, resolveValues );
372372
}
373373
};
374374
};
375375

376376
// Single- and empty arguments are adopted like Promise.resolve
377377
if ( remaining <= 1 ) {
378-
adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
378+
adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject,
379379
!remaining );
380380

381381
// Use .then() to unwrap secondary thenables (cf. gh-3000)
382-
if ( master.state() === "pending" ||
382+
if ( primary.state() === "pending" ||
383383
isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
384384

385-
return master.then();
385+
return primary.then();
386386
}
387387
}
388388

389389
// Multiple arguments are aggregated like Promise.all array elements
390390
while ( i-- ) {
391-
adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
391+
adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject );
392392
}
393393

394-
return master.promise();
394+
return primary.promise();
395395
}
396396
} );
397397

0 commit comments

Comments
 (0)