var namespaces = type.split(".");
type = namespaces.shift();
var all = !namespaces.length,
- namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)"),
+ namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)"),
special = this.special[ type ] || {};
if ( events[ type ] ) {
// Cache this now, all = true means, any handler
all = !namespaces.length && !event.exclusive;
- var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)");
+ var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
handlers = ( jQuery.data(this, "events") || {} )[ event.type ];
// handle event if we actually just moused on to a non sub-element
jQuery.event.handle.apply( this, arguments );
}
+
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+ event.type = event.data;
+ jQuery.event.handle.apply( this, arguments );
};
// Create mouseenter and mouseleave events
mouseout: "mouseleave"
}, function( orig, fix ) {
jQuery.event.special[ fix ] = {
- setup: function(){
- jQuery.event.add( this, orig, withinElement, fix );
+ setup: function(data){
+ jQuery.event.add( this, orig, data && data.selector ? delegate : withinElement, fix );
},
- teardown: function(){
- jQuery.event.remove( this, orig, withinElement );
+ teardown: function(data){
+ jQuery.event.remove( this, orig, data && data.selector ? delegate : withinElement );
}
};
});
return this.click( jQuery.event.proxy( fn, function( event ) {
// Figure out which function to execute
- this.lastToggle = ( this.lastToggle || 0 ) % i;
+ var lastToggle = ( jQuery.data( this, 'lastToggle' + fn.guid ) || 0 ) % i;
+ jQuery.data( this, 'lastToggle' + fn.guid, lastToggle + 1 );
// Make sure that clicks stop
event.preventDefault();
// and execute the function
- return args[ this.lastToggle++ ].apply( this, arguments ) || false;
+ return args[ lastToggle ].apply( this, arguments ) || false;
}));
},
jQuery.each( jQuery.data( this, "events" ).live || [], function( i, fn ) {
if ( fn.live === event.type ) {
- var elem = jQuery( event.target ).closest( fn.selector, event.currentTarget )[0];
+ var elem = jQuery( event.target ).closest( fn.selector, event.currentTarget )[0],
+ related;
if ( elem ) {
- elems.push({ elem: elem, fn: fn, closer: jQuery.lastCloser });
+ // Those two events require additional checking
+ if ( fn.live === "mouseenter" || fn.live === "mouseleave" ) {
+ related = jQuery( event.relatedTarget ).closest( fn.selector )[0];
+ }
+
+ if ( !related || related !== elem ) {
+ elems.push({ elem: elem, fn: fn });
+ }
}
}
});
ready: function() {
// Make sure that the DOM is not already loaded
if ( !jQuery.isReady ) {
+ if ( !document.body ) {
+ return setTimeout( jQuery.ready, 13 );
+ }
+
// Remember that the DOM is ready
jQuery.isReady = true;
// maybe late but safe also for iframes
document.attachEvent("onreadystatechange", function() {
// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
- if ( document.readyState === "complete" && document.body ) {
+ if ( document.readyState === "complete" ) {
document.detachEvent( "onreadystatechange", arguments.callee );
jQuery.ready();
}
});
- // If IE and not an iframe
+ // If IE and not a frame
// continually check to see if the document is ready
- // NOTE: DO NOT CHANGE TO ===, FAILS IN IE.
- if ( document.documentElement.doScroll && window == window.top ) (function() {
+ var toplevel = false;
+
+ try {
+ toplevel = window.frameElement == null;
+ } catch(e){}
+
+ if ( document.documentElement.doScroll && toplevel ) (function() {
if ( jQuery.isReady ) {
return;
}