Merge SlexAxton/jquery:master into jquery/jquery:master.

twss · Dec 27, 2010 · 01cba2e · 01cba2e
2 parents 4443371 + faabb2c
commit 01cba2e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/data.js b/src/data.js
@@ -10,7 +10,8 @@ jQuery.extend({
 	uuid: 0,
 
 	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + jQuery.now(),
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
 
 	// The following elements throw uncatchable exceptions if you
 	// attempt to add expando properties to them.