X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=f0b27de436f1d73ff5c2eef13bb646834bf48833;hb=bca576550249e9b79b1097669dff6d4ddd0d65cf;hp=173bab10e3a7db04aac1473b9db1bce34e3bf398;hpb=f68b46d7abb54cdcd3d1ce1713bc989f992d1448;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 173bab1..f0b27de 100644
--- a/src/event.js
+++ b/src/event.js
@@ -1,3 +1,5 @@
+(function( jQuery ) {
+
 var rnamespaces = /\.(.*)$/,
 	fcleanup = function( nm ) {
 		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
@@ -270,7 +272,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 +430,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;
 		}
 
@@ -554,10 +556,10 @@ jQuery.Event = function( src ) {
 
 	// timeStamp is buggy for some events on Firefox(#3843)
 	// So we won't rely on the native value
-	this.timeStamp = now();
+	this.timeStamp = jQuery.now();
 
 	// Mark it as fixed
-	this[ expando ] = true;
+	this[ jQuery.expando ] = true;
 };
 
 function returnFalse() {
@@ -1109,3 +1111,5 @@ if ( window.attachEvent && !window.addEventListener ) {
 		}
 	});
 }
+
+})( jQuery );