if ( typeof jQuery == "undefined" || jQuery.event.triggered )
return val;
- val = jQuery.event.handle.apply(elem, arguments);
+ val = jQuery.event.handle.apply(arguments.callee.elem, arguments);
return val;
});
+ // 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);
// 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,
if ( events ) {
// Unbind all events for the element
- if ( !types )
+ if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") )
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 ) {
// 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" );
}
// Clone the incoming data, if any
data = jQuery.makeArray(data || []);
+ if ( type.indexOf("!") >= 0 ) {
+ type = type.slice(0, -1);
+ var exclusive = true;
+ }
+
// Handle a global trigger
if ( !elem ) {
// Only trigger if we've ever bound an event for it
// 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") ) )
// 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;
args[0].data = handler.data;
// Filter the functions by class
- if ( !parts[1] || handler.type == parts[1] ) {
+ if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) {
var ret = handler.apply( this, args );
if ( val !== false )
}
// 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)
}
// Trigger any bound ready events
- $(document).triggerHandler("ready");
+ jQuery(document).triggerHandler("ready");
}
}
});
if ( readyBound ) return;
readyBound = true;
- // Mozilla, Opera and webkit nightlies currently support this event
- if ( document.addEventListener )
+ // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
+ if ( document.addEventListener && !jQuery.browser.opera)
// Use the handy event callback
document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
- // If Safari or IE is used
+ // If IE is used and is not in a frame
// Continually check to see if the document is ready
- if (jQuery.browser.msie || jQuery.browser.safari ) (function(){
+ if ( jQuery.browser.msie && window == top ) (function(){
+ if (jQuery.isReady) return;
try {
// If IE is used, use the trick by Diego Perini
// http://javascript.nwbox.com/IEContentLoaded/
- if ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" )
- document.documentElement.doScroll("left");
+ document.documentElement.doScroll("left");
} catch( error ) {
- return setTimeout( arguments.callee, 0 );
+ setTimeout( arguments.callee, 0 );
+ return;
}
-
// and execute any waiting functions
jQuery.ready();
})();
+ if ( jQuery.browser.opera )
+ document.addEventListener( "DOMContentLoaded", function () {
+ if (jQuery.isReady) return;
+ for (var i = 0; i < document.styleSheets.length; i++)
+ if (document.styleSheets[i].disabled) {
+ setTimeout( arguments.callee, 0 );
+ return;
+ }
+ // and execute any waiting functions
+ jQuery.ready();
+ }, false);
+
+ if ( jQuery.browser.safari ) {
+ var numStyles;
+ (function(){
+ if (jQuery.isReady) return;
+ if ( document.readyState != "loaded" && document.readyState != "complete" ) {
+ setTimeout( arguments.callee, 0 );
+ return;
+ }
+ if ( numStyles === undefined )
+ numStyles = jQuery("style, link[rel=stylesheet]").length;
+ if ( document.styleSheets.length != numStyles ) {
+ setTimeout( arguments.callee, 0 );
+ return;
+ }
+ // and execute any waiting functions
+ jQuery.ready();
+ })();
+ }
+
// A fallback to window.onload, that will always work
jQuery.event.add( window, "load", jQuery.ready );
}
// 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;
};
git.asbjorn.biz / jquery.git / blobdiff