jquery event: adding some whitespaces to the last change.

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index d5be7c5..4c710c1 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -41,18 +41,15 @@ jQuery.event = {
                // Init the element's event structure
                var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
                        handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
                // Init the element's event structure
                var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}),
                        handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){

-                               // returned undefined or false
-                               var val;
-

                                // Handle the second event of a trigger and when
                                // an event is called after a page has unloaded
                                // Handle the second event of a trigger and when
                                // an event is called after a page has unloaded

-                               if ( typeof jQuery == "undefined" || jQuery.event.triggered )
-                                       return val;
-               
-                               val = jQuery.event.handle.apply(elem, arguments);
-               
-                               return val;
+                               if ( typeof jQuery != "undefined" && !jQuery.event.triggered )
+                                       return jQuery.event.handle.apply(arguments.callee.elem, arguments);

                        });
                        });

+               // Add elem as a property of the handle function
+               // This is to prevent a memory leak with non-native
+               // event in IE.
+               handle.elem = elem;

                        
                        // Handle multiple events seperated by a space
                        // jQuery(...).bind("mouseover mouseout", fn);
                        
                        // Handle multiple events seperated by a space
                        // jQuery(...).bind("mouseover mouseout", fn);

@@ -87,6 +84,9 @@ jQuery.event = {
                                // Keep track of which events have been used, for global triggering
                                jQuery.event.global[type] = true;
                        });
                                // Keep track of which events have been used, for global triggering
                                jQuery.event.global[type] = true;
                        });

+               
+               // Nullify elem to prevent memory leaks in IE
+               elem = null;

        },
 
        guid: 1,
        },
 
        guid: 1,

@@ -102,9 +102,9 @@ jQuery.event = {
 
                if ( events ) {
                        // Unbind all events for the element
 
                if ( events ) {
                        // Unbind all events for the element

-                       if ( types == undefined )
+                       if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") )

                                for ( var type in events )
                                for ( var type in events )

-                                       this.remove( elem, type );
+                                       this.remove( elem, type + (types || "") );

                        else {
                                // types is actually an event object here
                                if ( types.type ) {
                        else {
                                // types is actually an event object here
                                if ( types.type ) {

@@ -150,6 +150,8 @@ jQuery.event = {
                        // Remove the expando if it's no longer used
                        for ( ret in events ) break;
                        if ( !ret ) {
                        // Remove the expando if it's no longer used
                        for ( ret in events ) break;
                        if ( !ret ) {

+                               var handle = jQuery.data( elem, "handle" );
+                               if ( handle ) handle.elem = null;

                                jQuery.removeData( elem, "events" );
                                jQuery.removeData( elem, "handle" );
                        }
                                jQuery.removeData( elem, "events" );
                                jQuery.removeData( elem, "handle" );
                        }

@@ -158,7 +160,12 @@ jQuery.event = {
 
        trigger: function(type, data, elem, donative, extra) {
                // Clone the incoming data, if any
 
        trigger: function(type, data, elem, donative, extra) {
                // Clone the incoming data, if any

-               data = jQuery.makeArray(data || []);
+               data = jQuery.makeArray(data);
+
+               if ( type.indexOf("!") >= 0 ) {
+                       type = type.slice(0, -1);
+                       var exclusive = true;
+               }

 
                // Handle a global trigger
                if ( !elem ) {
 
                // Handle a global trigger
                if ( !elem ) {

@@ -177,18 +184,29 @@ jQuery.event = {
                                event = !data[0] || !data[0].preventDefault;
                        
                        // Pass along a fake event
                                event = !data[0] || !data[0].preventDefault;
                        
                        // Pass along a fake event

-                       if ( event )
-                               data.unshift( this.fix({ type: type, target: elem }) );
+                       if ( event ) {
+                               data.unshift({ 
+                                       type: type, 
+                                       target: elem, 
+                                       preventDefault: function(){}, 
+                                       stopPropagation: function(){}, 
+                                       timeStamp: +new Date
+                               });
+                               data[0][expando] = true; // no need to fix fake event
+                       }

 
                        // Enforce the right trigger type
                        data[0].type = type;
 
                        // Enforce the right trigger type
                        data[0].type = type;

+                       if ( exclusive )
+                               data[0].exclusive = true;

 
 

-                       // Trigger the event
-                       if ( jQuery.isFunction( jQuery.data(elem, "handle") ) )
-                               val = jQuery.data(elem, "handle").apply( elem, data );
+                       // Trigger the event, it is assumed that "handle" is a function
+                       var handle = jQuery.data(elem, "handle"); 
+                       if ( handle ) 
+                               val = handle.apply( elem, data );

 
 

-                       // Handle triggering native .onfoo handlers
-                       if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+                       // Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
+                       if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )

                                val = false;
 
                        // Extra functions don't get the custom event object
                                val = false;
 
                        // Extra functions don't get the custom event object

@@ -198,7 +216,7 @@ jQuery.event = {
                        // Handle triggering of extra function
                        if ( extra && jQuery.isFunction( extra ) ) {
                                // call the extra function and tack the current return value on the end for possible inspection
                        // Handle triggering of extra function
                        if ( extra && jQuery.isFunction( extra ) ) {
                                // call the extra function and tack the current return value on the end for possible inspection

-                               var ret = extra.apply( elem, data.concat( val ) );
+                               ret = extra.apply( elem, val == null ? data : data.concat( val ) );

                                // if anything is returned, give it precedence and have it overwrite the previous value
                                if (ret !== undefined)
                                        val = ret;
                                // if anything is returned, give it precedence and have it overwrite the previous value
                                if (ret !== undefined)
                                        val = ret;

@@ -221,28 +239,29 @@ jQuery.event = {
 
        handle: function(event) {
                // returned undefined or false
 
        handle: function(event) {
                // returned undefined or false

-               var val;
+               var val, ret, namespace, all, handlers;

 
 

-               // Empty object is for triggered events with no data
-               event = jQuery.event.fix( event || window.event || {} ); 
+               event = arguments[0] = jQuery.event.fix( event || window.event );

 
                // Namespaced event handlers
 
                // Namespaced event handlers

-               var parts = event.type.split(".");
-               event.type = parts[0];
+               namespace = event.type.split(".");
+               event.type = namespace[0];
+               namespace = namespace[1];
+               all = !namespace && !event.exclusive; //cache this now, all = true means, any handler

 
 

-               var handlers = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
-               args.unshift( event );
+               handlers = ( jQuery.data(this, "events") || {} )[event.type];

 
                for ( var j in handlers ) {
                        var handler = handlers[j];
 
                for ( var j in handlers ) {
                        var handler = handlers[j];

-                       // Pass in a reference to the handler function itself
-                       // So that we can later remove it
-                       args[0].handler = handler;
-                       args[0].data = handler.data;

 
                        // Filter the functions by class
 
                        // Filter the functions by class

-                       if ( !parts[1] || handler.type == parts[1] ) {
-                               var ret = handler.apply( this, args );
+                       if ( all || handler.type == namespace ) {
+                               // Pass in a reference to the handler function itself
+                               // So that we can later remove it
+                               event.handler = handler;
+                               event.data = handler.data;
+                               
+                               ret = handler.apply( this, arguments );

 
                                if ( val !== false )
                                        val = ret;
 
                                if ( val !== false )
                                        val = ret;

@@ -254,19 +273,23 @@ jQuery.event = {
                        }
                }
 
                        }
                }
 

-               // Clean up added properties in IE to prevent memory leak
-               if (jQuery.browser.msie)
-                       event.target = event.preventDefault = event.stopPropagation =
-                               event.handler = event.data = null;
-

                return val;
        },
 
        fix: function(event) {
                return val;
        },
 
        fix: function(event) {

+               if ( event[expando] == true ) 
+                       return event;
+               

                // store a copy of the original event object 
                // store a copy of the original event object 

-               // and clone to set read-only properties
+               // and "clone" to set read-only properties

                var originalEvent = event;
                var originalEvent = event;

-               event = jQuery.extend({}, originalEvent);
+               event = { originalEvent: originalEvent };
+               var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
+               for ( var i=props.length; i; i-- )
+                       event[ props[i] ] = originalEvent[ props[i] ];
+               
+               // Mark it as fixed
+               event[expando] = true;

                
                // add preventDefault and stopPropagation since 
                // they will not work on the clone
                
                // add preventDefault and stopPropagation since 
                // they will not work on the clone

@@ -285,13 +308,16 @@ jQuery.event = {
                        originalEvent.cancelBubble = true;
                };
                
                        originalEvent.cancelBubble = true;
                };
                

+               // Fix timeStamp
+               event.timeStamp = event.timeStamp || +new Date;
+               

                // Fix target property, if necessary
                if ( !event.target )
                        event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
                                
                // check if target is a textnode (safari)
                if ( event.target.nodeType == 3 )
                // Fix target property, if necessary
                if ( !event.target )
                        event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
                                
                // check if target is a textnode (safari)
                if ( event.target.nodeType == 3 )

-                       event.target = originalEvent.target.parentNode;
+                       event.target = event.target.parentNode;

 
                // Add relatedTarget, if necessary
                if ( !event.relatedTarget && event.fromElement )
 
                // Add relatedTarget, if necessary
                if ( !event.relatedTarget && event.fromElement )

@@ -305,7 +331,7 @@ jQuery.event = {
                }
                        
                // Add which for key events
                }
                        
                // Add which for key events

-               if ( !event.which && (event.charCode || event.keyCode) )
+               if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) )

                        event.which = event.charCode || event.keyCode;
                
                // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
                        event.which = event.charCode || event.keyCode;
                
                // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)

@@ -417,13 +443,13 @@ jQuery.fn.extend({
 
                return this.click(function(event) {
                        // Figure out which function to execute
 
                return this.click(function(event) {
                        // Figure out which function to execute

-                       this.lastToggle = 0 == this.lastToggle ? 1 : 0;
+                       this.lastToggle = ( this.lastToggle || 0 ) % args.length;

                        
                        // Make sure that clicks stop
                        event.preventDefault();
                        
                        // and execute the function
                        
                        // Make sure that clicks stop
                        event.preventDefault();
                        
                        // and execute the function

-                       return args[this.lastToggle].apply( this, arguments ) || false;
+                       return args[ this.lastToggle++ ].apply( this, arguments ) || false;

                });
        },
 
                });
        },
 

@@ -554,7 +580,7 @@ var withinElement = function(event, elem) {
        // Check if mouse(over|out) are still within the same parent element
        var parent = event.relatedTarget;
        // Traverse up the tree
        // Check if mouse(over|out) are still within the same parent element
        var parent = event.relatedTarget;
        // Traverse up the tree

-       while ( parent && parent != elem ) try { parent = parent.parentNode } catch(error) { parent = elem; };
+       while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; }

        // Return true if we actually just moused on to a sub-element
        return parent == elem;
 };
        // Return true if we actually just moused on to a sub-element
        return parent == elem;
 };