Skip to content
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
jeresig committed Apr 24, 2010
1 parent 4a64f9a commit 1533bf7c7794d8e078e7ce5e36de6d190651540a
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
0 speed/benchmarker.css 100755 → 100644
No changes.
0 speed/benchmarker.js 100755 → 100644
No changes.
0 speed/index.html 100755 → 100644
No changes.
@@ -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
@@ -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() {

1 comment on commit 1533bf7

@cwillu

This comment has been minimized.

Copy link

cwillu commented on 1533bf7 Nov 19, 2010

Ugh.

If one already had a function (to make uuid's, for instance) on $.uuid, this commit completely and silently breaks jquery event binding. Could we get a release note and documentation, or even a _uuid name?

Please sign in to comment.
You can’t perform that action at this time.