Permalink
Browse files

Expose jQuery.uuid (use with caution) and make sure the expando prope…

…rty is used in the events module.
  • Loading branch information...
1 parent 23699bc commit ef8df7f55c3fb0466fa59d5cee20a2c34f009725 @jeresig jeresig committed with wycats Apr 24, 2010
Showing with 11 additions and 7 deletions.
  1. 0 speed/benchmarker.css
  2. 0 speed/benchmarker.js
  3. 0 speed/index.html
  4. +8 −4 src/data.js
  5. +3 −3 src/event.js
View
0 speed/benchmarker.css 100755 → 100644
File mode changed.
View
0 speed/benchmarker.js 100755 → 100644
File mode changed.
View
0 speed/index.html 100755 → 100644
File mode changed.
View
12 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
View
6 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() {

0 comments on commit ef8df7f

Please sign in to comment.