}
// Make sure that the function being executed has a unique ID
- if ( !handler.guid )
+ if ( !handler.guid ) {
handler.guid = this.guid++;
+ // Don't forget to set guid for the original handler function
+ if (fn) fn.guid = handler.guid;
+ }
// Init the element's event structure
if (!element.$events)
element.$events = {};
-
- // Get the current list of functions bound to this event
- var handlers = element.$events[type];
-
- // Init the event handler queue
- if (!handlers)
- handlers = element.$events[type] = {};
-
- // Add the function to the element's handler list
- handlers[handler.guid] = handler;
- if (!element.$handle) {
+ if (!element.$handle)
element.$handle = function() {
jQuery.event.handle.apply(element, arguments);
};
+ // Get the current list of functions bound to this event
+ var handlers = element.$events[type];
+
+ // Init the event handler queue
+ if (!handlers) {
+ handlers = element.$events[type] = {};
+
// And bind the global event handler to the element
if (element.addEventListener)
element.addEventListener(type, element.$handle, false);
else if (element.attachEvent)
- element.attachEvent("on" + type, element.$handle, false);
+ element.attachEvent("on" + type, element.$handle);
}
+ // Add the function to the element's handler list
+ handlers[handler.guid] = handler;
+
// Remember the function in a global list (for triggering)
if (!this.global[type])
this.global[type] = [];
if (element.removeEventListener)
element.removeEventListener(type, element.$handle, false);
else if (element.detachEvent)
- element.detachEvent("on" + type, element.$handle, false);
- ret = element.$handle = null;
+ element.detachEvent("on" + type, element.$handle);
+ ret = null;
delete events[type];
}
}
// Remove the expando if it's no longer used
for ( ret in events ) break;
if ( !ret )
- element.$events = null;
+ element.$handle = element.$events = null;
}
},
// Handle triggering a single element
else {
- var val, ret, fn = jQuery.isFunction( element[ type ] );
+ var val, ret, fn = jQuery.isFunction( element[ type ] || null );
// Pass along a fake event
data.unshift( this.fix({ type: type, target: element }) );
},
handle: function(event) {
+ // returned undefined or false
+ var val;
+
// 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;
+ if ( typeof jQuery == "undefined" || jQuery.event.triggered )
+ return val;
// Empty object is for triggered events with no data
event = jQuery.event.fix( event || window.event || {} );
- // returned undefined or false
- var returnValue;
-
- var c = this.$events[event.type];
-
- var args = [].slice.call( arguments, 1 );
+ var c = this.$events && this.$events[event.type], args = [].slice.call( arguments, 1 );
args.unshift( event );
for ( var j in c ) {
if ( c[j].apply( this, args ) === false ) {
event.preventDefault();
event.stopPropagation();
- returnValue = false;
+ val = false;
}
}
// 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;
+ if (jQuery.browser.msie)
+ event.target = event.preventDefault = event.stopPropagation =
+ event.handler = event.data = null;
- return returnValue;
+ return val;
},
fix: function(event) {
// Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == undefined && event.clientX != undefined ) {
- var e = document.documentElement, b = document.body;
- event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft);
- event.pageY = event.clientY + (e.scrollTop || b.scrollTop);
+ var e = document.documentElement || document.body;
+ event.pageX = event.clientX + e.scrollLeft;
+ event.pageY = event.clientY + e.scrollTop;
}
// check if target is a textnode (safari)
*/
bind: function( type, data, fn ) {
return this.each(function(){
- jQuery.event.add( this, type, fn || data, data );
+ jQuery.event.add( this, type, fn || data, fn && data );
});
},
jQuery.event.add( this, type, function(event) {
jQuery(this).unbind(event);
return (fn || data).apply( this, arguments);
- }, data);
+ }, fn && data);
});
},
return this.click(function(e) {
// Figure out which function to execute
- this.lastToggle = this.lastToggle == 0 ? 1 : 0;
+ this.lastToggle = 0 == this.lastToggle ? 1 : 0;
// Make sure that clicks stop
e.preventDefault();
// Remove event lisenter to avoid memory leak
if ( jQuery.browser.mozilla || jQuery.browser.opera )
document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
+
+ // Remove script element used by IE hack
+ jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
}
}
});
if ( script )
script.onreadystatechange = function() {
if ( this.readyState != "complete" ) return;
- this.parentNode.removeChild( this );
jQuery.ready();
};
git.asbjorn.biz / jquery.git / blobdiff