Removing extra arg.

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index cec2845..1fec18c 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 ) {

@@ -90,7 +92,9 @@ jQuery.event = {
                        }
 
                        handleObj.type = type;
                        }
 
                        handleObj.type = type;

-                       handleObj.guid = handler.guid;
+                       if ( !handleObj.guid ) {
+                               handleObj.guid = handler.guid;
+                       }

 
                        // Get the current list of functions bound to this event
                        var handlers = events[ type ],
 
                        // Get the current list of functions bound to this event
                        var handlers = events[ type ],

@@ -235,7 +239,7 @@ jQuery.event = {
                        // remove generic event handler if no more handlers exist
                        if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
                                if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
                        // remove generic event handler if no more handlers exist
                        if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
                                if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {

-                                       removeEvent( elem, type, elemData.handle );
+                                       jQuery.removeEvent( elem, type, elemData.handle );

                                }
 
                                ret = null;
                                }
 
                                ret = null;

@@ -268,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)

@@ -335,31 +339,31 @@ jQuery.event = {
                        jQuery.event.trigger( event, data, parent, true );
 
                } else if ( !event.isDefaultPrevented() ) {
                        jQuery.event.trigger( event, data, parent, true );
 
                } else if ( !event.isDefaultPrevented() ) {

-                       var target = event.target, old,
-                               isClick = jQuery.nodeName(target, "a") && type === "click",
-                               special = jQuery.event.special[ type ] || {};
+                       var target = event.target, old, targetType = type.replace(/\..*$/, ""),
+                               isClick = jQuery.nodeName(target, "a") && targetType === "click",
+                               special = jQuery.event.special[ targetType ] || {};

 
                        if ( (!special._default || special._default.call( elem, event ) === false) && 
                                !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
 
                                try {
 
                        if ( (!special._default || special._default.call( elem, event ) === false) && 
                                !isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
 
                                try {

-                                       if ( target[ type ] ) {
+                                       if ( target[ targetType ] ) {

                                                // Make sure that we don't accidentally re-trigger the onFOO events
                                                // Make sure that we don't accidentally re-trigger the onFOO events

-                                               old = target[ "on" + type ];
+                                               old = target[ "on" + targetType ];

 
                                                if ( old ) {
 
                                                if ( old ) {

-                                                       target[ "on" + type ] = null;
+                                                       target[ "on" + targetType ] = null;

                                                }
 
                                                jQuery.event.triggered = true;
                                                }
 
                                                jQuery.event.triggered = true;

-                                               target[ type ]();
+                                               target[ targetType ]();

                                        }
 
                                // prevent IE from throwing an error for some elements with some event types, see #3533
                                } catch (triggerError) {}
 
                                if ( old ) {
                                        }
 
                                // prevent IE from throwing an error for some elements with some event types, see #3533
                                } catch (triggerError) {}
 
                                if ( old ) {

-                                       target[ "on" + type ] = old;
+                                       target[ "on" + targetType ] = old;

                                }
 
                                jQuery.event.triggered = false;
                                }
 
                                jQuery.event.triggered = false;

@@ -368,7 +372,7 @@ jQuery.event = {
        },
 
        handle: function( event ) {
        },
 
        handle: function( event ) {

-               var all, handlers, namespaces, namespace, events, args = jQuery.makeArray( arguments );
+               var all, handlers, namespaces, namespace_sort = [], namespace_re, events, args = jQuery.makeArray( arguments );

 
                event = args[0] = jQuery.event.fix( event || window.event );
                event.currentTarget = this;
 
                event = args[0] = jQuery.event.fix( event || window.event );
                event.currentTarget = this;

@@ -379,9 +383,12 @@ jQuery.event = {
                if ( !all ) {
                        namespaces = event.type.split(".");
                        event.type = namespaces.shift();
                if ( !all ) {
                        namespaces = event.type.split(".");
                        event.type = namespaces.shift();

-                       namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+                       namespace_sort = namespaces.slice(0).sort();
+                       namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");

                }
 
                }
 

+               event.namespace = event.namespace || namespace_sort.join(".");
+

                events = jQuery.data(this, "events");
                handlers = (events || {})[ event.type ];
 
                events = jQuery.data(this, "events");
                handlers = (events || {})[ event.type ];
 

@@ -393,7 +400,7 @@ jQuery.event = {
                                var handleObj = handlers[ j ];
 
                                // Filter the functions by class
                                var handleObj = handlers[ j ];
 
                                // Filter the functions by class

-                               if ( all || namespace.test( handleObj.namespace ) ) {
+                               if ( all || namespace_re.test( handleObj.namespace ) ) {

                                        // Pass in a reference to the handler function itself
                                        // So that we can later remove it
                                        event.handler = handleObj.handler;
                                        // Pass in a reference to the handler function itself
                                        // So that we can later remove it
                                        event.handler = handleObj.handler;

@@ -423,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;
                }
 

@@ -493,25 +500,14 @@ jQuery.event = {
 
                live: {
                        add: function( handleObj ) {
 
                live: {
                        add: function( handleObj ) {

-                               jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
+                               jQuery.event.add( this,
+                                       liveConvert( handleObj.origType, handleObj.selector ),
+                                       jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); 

                        },
 
                        remove: function( handleObj ) {
                        },
 
                        remove: function( handleObj ) {

-                               var remove = true,
-                                       type = handleObj.origType.replace(rnamespaces, "");
-                               
-                               jQuery.each( jQuery.data(this, "events").live || [], function() {
-                                       if ( type === this.origType.replace(rnamespaces, "") ) {
-                                               remove = false;
-                                               return false;
-                                       }
-                               });
-
-                               if ( remove ) {
-                                       jQuery.event.remove( this, handleObj.origType, liveHandler );
-                               }
+                               jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );

                        }
                        }

-

                },
 
                beforeunload: {
                },
 
                beforeunload: {

@@ -531,7 +527,7 @@ jQuery.event = {
        }
 };
 
        }
 };
 

-var removeEvent = document.removeEventListener ?
+jQuery.removeEvent = document.removeEventListener ?

        function( elem, type, handle ) {
                if ( elem.removeEventListener ) {
                        elem.removeEventListener( type, handle, false );
        function( elem, type, handle ) {
                if ( elem.removeEventListener ) {
                        elem.removeEventListener( type, handle, false );

@@ -560,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() {

@@ -587,9 +583,11 @@ jQuery.Event.prototype = {
                // if preventDefault exists run it on the original event
                if ( e.preventDefault ) {
                        e.preventDefault();
                // if preventDefault exists run it on the original event
                if ( e.preventDefault ) {
                        e.preventDefault();

-               }
+

                // otherwise set the returnValue property of the original event to false (IE)
                // otherwise set the returnValue property of the original event to false (IE)

-               e.returnValue = false;
+               } else {
+                       e.returnValue = false;
+               }

        },
        stopPropagation: function() {
                this.isPropagationStopped = returnTrue;
        },
        stopPropagation: function() {
                this.isPropagationStopped = returnTrue;

@@ -981,13 +979,13 @@ jQuery.each(["live", "die"], function( i, name ) {
                        if ( name === "live" ) {
                                // bind live handler
                                for ( var j = 0, l = context.length; j < l; j++ ) {
                        if ( name === "live" ) {
                                // bind live handler
                                for ( var j = 0, l = context.length; j < l; j++ ) {

-                                       jQuery.event.add( context[j], liveConvert( type, selector ),
+                                       jQuery.event.add( context[j], "live." + liveConvert( type, selector ),

                                                { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
                                }
 
                        } else {
                                // unbind live handler
                                                { data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
                                }
 
                        } else {
                                // unbind live handler

-                               context.unbind( liveConvert( type, selector ), fn );
+                               context.unbind( "live." + liveConvert( type, selector ), fn );

                        }
                }
                
                        }
                }
                

@@ -997,7 +995,7 @@ jQuery.each(["live", "die"], function( i, name ) {
 
 function liveHandler( event ) {
        var stop, maxLevel, elems = [], selectors = [],
 
 function liveHandler( event ) {
        var stop, maxLevel, elems = [], selectors = [],

-               related, match, handleObj, elem, j, i, l, data, close,
+               related, match, handleObj, elem, j, i, l, data, close, namespace,

                events = jQuery.data( this, "events" );
 
        // Make sure we avoid non-left-click bubbling in Firefox (#3861)
                events = jQuery.data( this, "events" );
 
        // Make sure we avoid non-left-click bubbling in Firefox (#3861)

@@ -1005,6 +1003,10 @@ function liveHandler( event ) {
                return;
        }
 
                return;
        }
 

+       if ( event.namespace ) {
+               namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
+       }
+

        event.liveFired = this;
 
        var live = events.live.slice(0);
        event.liveFired = this;
 
        var live = events.live.slice(0);

@@ -1028,7 +1030,7 @@ function liveHandler( event ) {
                for ( j = 0; j < live.length; j++ ) {
                        handleObj = live[j];
 
                for ( j = 0; j < live.length; j++ ) {
                        handleObj = live[j];
 

-                       if ( close.selector === handleObj.selector ) {
+                       if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) {

                                elem = close.elem;
                                related = null;
 
                                elem = close.elem;
                                related = null;
 

@@ -1071,7 +1073,7 @@ function liveHandler( event ) {
 }
 
 function liveConvert( type, selector ) {
 }
 
 function liveConvert( type, selector ) {

-       return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
+       return (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");

 }
 
 jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
 }
 
 jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +

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

+
+})( jQuery );