Expose jQuery.uuid (use with caution) and make sure the expando property is used...

diff --git a/speed/benchmarker.css b/speed/benchmarker.css
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/speed/benchmarker.js b/speed/benchmarker.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/speed/index.html b/speed/index.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/data.js b/src/data.js
index cddd8bdead0042476124e1a61652651fa74c0a6a..a4c4e4b6da23ea38cf29531eec9f3c2c232ae85e 100644 (file)
--- a/src/data.js
+++ b/src/data.js
@@ -1,9 +1,13 @@
-var expando = "jQuery" + jQuery.now(), uuid = 0, windowData = {};
+var windowData = {};
 
 jQuery.extend({
        cache: {},
-       
-       expando: expando,
+
+       // Please use with caution
+       uuid: 0,
+
+       // Unique for each copy of jQuery on the page   
+       expando: "jQuery" + jQuery.now(),
 
        // The following elements throw uncatchable exceptions if you
        // attempt to add expando properties to them.
@@ -36,7 +40,7 @@ jQuery.extend({
 
                // Compute a unique ID for the element
                } else if ( !id ) {
-                       elem[ jQuery.expando ] = id = ++uuid;
+                       elem[ jQuery.expando ] = id = ++jQuery.uuid;
                }
 
                // Avoid generating a new cache unless none exists and we

diff --git a/src/event.js b/src/event.js
index 588a7979ac5a5443b5834d667faad68b1ae88267..45f2202c5060ac4762bb5d69b389a9dfc9ac255f 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -270,7 +270,7 @@ jQuery.event = {
                if ( !bubbling ) {
                        event = typeof event === "object" ?
                                // jQuery.Event object
-                               event[expando] ? event :
+                               event[ jQuery.expando ] ? event :
                                // Object literal
                                jQuery.extend( jQuery.Event(type), event ) :
                                // Just the event type (string)
@@ -428,7 +428,7 @@ jQuery.event = {
        props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
 
        fix: function( event ) {
-               if ( event[ expando ] ) {
+               if ( event[ jQuery.expando ] ) {
                        return event;
                }
 
@@ -557,7 +557,7 @@ jQuery.Event = function( src ) {
        this.timeStamp = jQuery.now();
 
        // Mark it as fixed
-       this[ expando ] = true;
+       this[ jQuery.expando ] = true;
 };
 
 function returnFalse() {