Core:Ajax: Align nonce & global with master, fix an AMD issue

mgol · web-flow · commit 22bf701fe1b2 · 2020-02-24T19:10:03.000+01:00
This commit aligns the `3.x-stable` branch with `master` in two aspects: 1. It migrates the nonce module to return an object instead of a primitive variable. This had to be changed on `master` as in ES modules you export live read-only bindings to variables, meaning you can't increment the nonce directly. Also, the way it was done so far was working differently in AMD & the single built file - in the built file one nonce variable was declared, accessed and incremented. In AMD mode separate instances were create for each module that depend on the nonce module, creating unintended nonce clashes. 2. Whether the `noGlobal` parameter was set to `true` is now checked using the typeof operator to align with `master`. Closes gh-4612 Ref gh-4541 Ref d0ce00c
diff --git a/src/ajax.js b/src/ajax.js
@@ -610,7 +610,8 @@ jQuery.extend( {
 			// Add or update anti-cache param if needed
 			if ( s.cache === false ) {
 				cacheURL = cacheURL.replace( rantiCache, "$1" );
-				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
+				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +
+					uncached;
 			}
 
 			// Put hash and anti-cache on the URL that will be requested (gh-1732)
diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
@@ -15,7 +15,7 @@ var oldCallbacks = [],
 jQuery.ajaxSetup( {
 	jsonp: "callback",
 	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) );
 		this[ callback ] = true;
 		return callback;
 	}
diff --git a/src/ajax/var/nonce.js b/src/ajax/var/nonce.js
@@ -1,5 +1,5 @@
 define( function() {
 	"use strict";
 
-	return Date.now();
+	return { guid: Date.now() };
 } );
diff --git a/src/exports/global.js b/src/exports/global.js
@@ -1,6 +1,6 @@
 define( [
 	"../core"
-], function( jQuery, noGlobal ) {
+], function( jQuery ) {
 
 "use strict";
 
@@ -27,7 +27,7 @@ jQuery.noConflict = function( deep ) {
 // Expose jQuery and $ identifiers, even in AMD
 // (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
 // and CommonJS for browser emulators (#13566)
-if ( !noGlobal ) {
+if ( typeof noGlobal === "undefined" ) {
 	window.jQuery = window.$ = jQuery;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -610,7 +610,8 @@ jQuery.extend( {`
`610`	`610`	`// Add or update anti-cache param if needed`
`611`	`611`	`if ( s.cache === false ) {`
`612`	`612`	`cacheURL = cacheURL.replace( rantiCache, "$1" );`
`613`		`- uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;`
	`613`	`+ uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +`
	`614`	`+ uncached;`
`614`	`615`	`}`
`615`	`616`
`616`	`617`	`// Put hash and anti-cache on the URL that will be requested (gh-1732)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ var oldCallbacks = [],`
`15`	`15`	`jQuery.ajaxSetup( {`
`16`	`16`	`jsonp: "callback",`
`17`	`17`	`jsonpCallback: function() {`
`18`		`- var callback = oldCallbacks.pop() \|\| ( jQuery.expando + "_" + ( nonce++ ) );`
	`18`	`+ var callback = oldCallbacks.pop() \|\| ( jQuery.expando + "_" + ( nonce.guid++ ) );`
`19`	`19`	`this[ callback ] = true;`
`20`	`20`	`return callback;`
`21`	`21`	`}`