Make sure that jQuery works even when the individual modules are loaded separately...

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 173bab1..f0b27de 100644 (file)
--- 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 ) {
 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
                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)
                                // 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 ) {
        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;
                }
 
                        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
 
        // 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
 
        // Mark it as fixed

-       this[ expando ] = true;
+       this[ jQuery.expando ] = true;

 };
 
 function returnFalse() {
 };
 
 function returnFalse() {

@@ -1109,3 +1111,5 @@ if ( window.attachEvent && !window.addEventListener ) {
                }
        });
 }
                }
        });
 }

+
+})( jQuery );