if (!element.$handle)
element.$handle = function() {
- jQuery.event.handle.apply(element, arguments);
+ // 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 val;
+
+ val = jQuery.event.handle.apply(element, arguments);
+
+ return val;
};
// Get the current list of functions bound to this event
// And bind the global event handler to the element
if (element.addEventListener)
element.addEventListener(type, element.$handle, false);
- else if (element.attachEvent)
+ else
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] = [];
- this.global[type].push( element );
+ // Keep track of which events have been used, for global triggering
+ this.global[type] = true;
},
guid: 1,
// Detach an event or set of events from an element
remove: function(element, type, handler) {
- var events = element.$events, ret;
+ var events = element.$events, ret, index;
if ( events ) {
// type is actually an event object here
if ( !ret ) {
if (element.removeEventListener)
element.removeEventListener(type, element.$handle, false);
- else if (element.detachEvent)
+ else
element.detachEvent("on" + type, element.$handle);
ret = null;
delete events[type];
data = jQuery.makeArray(data || []);
// Handle a global trigger
- if ( !element )
- jQuery.each( this.global[type] || [], function(){
- jQuery.event.trigger( type, data, this );
- });
+ if ( !element ) {
+ // Only trigger if we've ever bound an event for it
+ if ( this.global[type] )
+ jQuery("*").trigger(type, data);
// Handle triggering a single element
- else {
+ } else {
var val, ret, fn = jQuery.isFunction( element[ type ] || null );
// Pass along a fake event
data.unshift( this.fix({ type: type, target: element }) );
// Trigger the event
- if ( (val = this.handle.apply( element, data )) !== false )
- this.triggered = true;
+ if ( jQuery.isFunction( element.$handle ) )
+ val = element.$handle.apply( element, data );
+ if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+ val = false;
- if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
+ if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+ this.triggered = true;
element[ type ]();
+ }
this.triggered = false;
}
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 val;
// Empty object is for triggered events with no data
event = jQuery.event.fix( event || window.event || {} );
// Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == null && event.clientX != null ) {
- var e = document.documentElement || document.body;
- event.pageX = event.clientX + e.scrollLeft;
- event.pageY = event.clientY + e.scrollTop;
+ var e = document.documentElement, b = document.body;
+ event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
+ event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
}
// Add which for key events
* data as the second parameter (and the handler function as the third), see
* second example.
*
+ * Calling bind with an event type of "unload" will automatically
+ * use the one method instead of bind to prevent memory leaks.
+ *
* @example $("p").bind("click", function(){
* alert( $(this).text() );
* });
* @cat Events
*/
bind: function( type, data, fn ) {
- return this.each(function(){
+ return type == "unload" ? this.one(type, data, fn) : this.each(function(){
jQuery.event.add( this, type, fn || data, fn && data );
});
},
var p = e.relatedTarget;
// Traverse up the tree
- while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; };
+ while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
// If we actually just moused on to a sub-element, ignore it
if ( p == this ) return false;
f.apply( document, [jQuery] );
// Otherwise, remember the function for later
- else {
+ else
// Add the function to the wait list
- jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
- }
+ jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
return this;
}
document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
// Remove script element used by IE hack
- jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
+ if( !window.frames.length ) // don't remove if frames are present (#1187)
+ jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
}
}
});
// script does not exist if jQuery is loaded dynamically
if ( script )
script.onreadystatechange = function() {
- if ( this.readyState != "complete" ) return;
+ if ( document.readyState != "complete" ) return;
jQuery.ready();
};
jQuery.event.add( window, "load", jQuery.ready );
};
-
-// Clean up after IE to avoid memory leaks
-if (jQuery.browser.msie)
- jQuery(window).one("unload", function() {
- var global = jQuery.event.global;
- for ( var type in global ) {
- var els = global[type], i = els.length;
- if ( i && type != 'unload' )
- do
- jQuery.event.remove(els[i-1], type);
- while (--i);
- }
- });
git.asbjorn.biz / jquery.git / blobdiff