Commit ef8df7f5 authored by John Resig's avatar John Resig Committed by wycats

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

Expose jQuery.uuid (use with caution) and make sure the expando property is used in the events module.
parent 23699bc7
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
var expando = "jQuery" + jQuery.now(), uuid = 0, windowData = {}; var windowData = {};
jQuery.extend({ jQuery.extend({
cache: {}, 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 // The following elements throw uncatchable exceptions if you
// attempt to add expando properties to them. // attempt to add expando properties to them.
...@@ -36,7 +40,7 @@ jQuery.extend({ ...@@ -36,7 +40,7 @@ jQuery.extend({
// Compute a unique ID for the element // Compute a unique ID for the element
} else if ( !id ) { } else if ( !id ) {
elem[ jQuery.expando ] = id = ++uuid; elem[ jQuery.expando ] = id = ++jQuery.uuid;
} }
// Avoid generating a new cache unless none exists and we // Avoid generating a new cache unless none exists and we
......
...@@ -270,7 +270,7 @@ jQuery.event = { ...@@ -270,7 +270,7 @@ jQuery.event = {
if ( !bubbling ) { if ( !bubbling ) {
event = typeof event === "object" ? event = typeof event === "object" ?
// jQuery.Event object // jQuery.Event object
event[expando] ? event : event[ jQuery.expando ] ? event :
// Object literal // Object literal
jQuery.extend( jQuery.Event(type), event ) : jQuery.extend( jQuery.Event(type), event ) :
// Just the event type (string) // Just the event type (string)
...@@ -428,7 +428,7 @@ jQuery.event = { ...@@ -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(" "), 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 ) { fix: function( event ) {
if ( event[ expando ] ) { if ( event[ jQuery.expando ] ) {
return event; return event;
} }
...@@ -557,7 +557,7 @@ jQuery.Event = function( src ) { ...@@ -557,7 +557,7 @@ jQuery.Event = function( src ) {
this.timeStamp = jQuery.now(); this.timeStamp = jQuery.now();
// Mark it as fixed // Mark it as fixed
this[ expando ] = true; this[ jQuery.expando ] = true;
}; };
function returnFalse() { function returnFalse() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment