Added support for map of events in live, die, delegate and undelegate. Fixes #6282.

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 588a797..e667ddb 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -1,8 +1,12 @@
+(function( jQuery ) {
+

 var rnamespaces = /\.(.*)$/,
 var rnamespaces = /\.(.*)$/,

+       rformElems = /^(?:textarea|input|select)$/i,
+       rperiod = /\./g,
+       rspace = / /g,
+       rescape = /[^\w\s.|`]/g,

        fcleanup = function( nm ) {
        fcleanup = function( nm ) {

-               return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
-                       return "\\" + ch;
-               });
+               return nm.replace(rescape, "\\$&");

        };
 
 /*
        };
 
 /*

@@ -21,7 +25,7 @@ jQuery.event = {
 
                // For whatever reason, IE has trouble passing the window object
                // around, causing it to be cloned in the process
 
                // For whatever reason, IE has trouble passing the window object
                // around, causing it to be cloned in the process

-               if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
+               if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {

                        elem = window;
                }
 
                        elem = window;
                }
 

@@ -237,7 +241,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;

@@ -270,7 +274,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)

@@ -337,7 +341,7 @@ 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, targetType = type.replace(/\..*$/, ""),
+                       var target = event.target, old, targetType = type.replace(rnamespaces, ""),

                                isClick = jQuery.nodeName(target, "a") && targetType === "click",
                                special = jQuery.event.special[ targetType ] || {};
 
                                isClick = jQuery.nodeName(target, "a") && targetType === "click",
                                special = jQuery.event.special[ targetType ] || {};
 

@@ -428,7 +432,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;
                }
 

@@ -511,7 +515,7 @@ jQuery.event = {
                beforeunload: {
                        setup: function( data, namespaces, eventHandle ) {
                                // We only want to do this special case on windows
                beforeunload: {
                        setup: function( data, namespaces, eventHandle ) {
                                // We only want to do this special case on windows

-                               if ( this.setInterval ) {
+                               if ( jQuery.isWindow( this ) ) {

                                        this.onbeforeunload = eventHandle;
                                }
                        },
                                        this.onbeforeunload = eventHandle;
                                }
                        },

@@ -525,7 +529,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 );

@@ -557,7 +561,7 @@ jQuery.Event = function( src ) {
        this.timeStamp = jQuery.now();
 
        // Mark it as fixed
        this.timeStamp = jQuery.now();
 
        // Mark it as fixed

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

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

@@ -581,9 +585,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;

@@ -693,9 +699,7 @@ if ( !jQuery.support.submitBubbles ) {
 // change delegation, happens here so we have bind.
 if ( !jQuery.support.changeBubbles ) {
 
 // change delegation, happens here so we have bind.
 if ( !jQuery.support.changeBubbles ) {
 

-       var formElems = /textarea|input|select/i,
-
-       changeFilters,
+       var changeFilters,

 
        getVal = function( elem ) {
                var type = elem.type, val = elem.value;
 
        getVal = function( elem ) {
                var type = elem.type, val = elem.value;

@@ -720,7 +724,7 @@ if ( !jQuery.support.changeBubbles ) {
        testChange = function testChange( e ) {
                var elem = e.target, data, val;
 
        testChange = function testChange( e ) {
                var elem = e.target, data, val;
 

-               if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
+               if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {

                        return;
                }
 
                        return;
                }
 

@@ -784,13 +788,13 @@ if ( !jQuery.support.changeBubbles ) {
                                jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
                        }
 
                                jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
                        }
 

-                       return formElems.test( this.nodeName );
+                       return rformElems.test( this.nodeName );

                },
 
                teardown: function( namespaces ) {
                        jQuery.event.remove( this, ".specialChange" );
 
                },
 
                teardown: function( namespaces ) {
                        jQuery.event.remove( this, ".specialChange" );
 

-                       return formElems.test( this.nodeName );
+                       return rformElems.test( this.nodeName );

                }
        };
 
                }
        };
 

@@ -940,6 +944,14 @@ jQuery.each(["live", "die"], function( i, name ) {
                var type, i = 0, match, namespaces, preType,
                        selector = origSelector || this.selector,
                        context = origSelector ? this : jQuery( this.context );
                var type, i = 0, match, namespaces, preType,
                        selector = origSelector || this.selector,
                        context = origSelector ? this : jQuery( this.context );

+               
+               if ( typeof types === "object" && !types.preventDefault ) {
+                       for ( var key in types ) {
+                               context[ name ]( key, data, types[key], selector );
+                       }
+                       
+                       return this;
+               }

 
                if ( jQuery.isFunction( data ) ) {
                        fn = data;
 
                if ( jQuery.isFunction( data ) ) {
                        fn = data;

@@ -991,7 +1003,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, namespace,
+               related, match, handleObj, elem, j, i, l, data, close, namespace, ret,

                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)

@@ -1069,7 +1081,7 @@ function liveHandler( event ) {
 }
 
 function liveConvert( type, selector ) {
 }
 
 function liveConvert( type, selector ) {

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

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

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

+
+})( jQuery );