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 ];
event.special[orig] = {
setup:function() {
- if ( this.addEventListener )
+ if ( this.addEventListener ) {
this.addEventListener( orig, handle, true );
- else
+ } else {
event.add( this, fix, ieHandler );
+ }
},
teardown:function() {
- if ( this.removeEventListener )
+ if ( this.removeEventListener ) {
this.removeEventListener( orig, handle, true );
- else
+ } else {
event.remove( this, fix, ieHandler );
+ }
}
};
});
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;
}));
},
var readyBound = false;
function bindReady() {
- if ( readyBound ) return;
+ if ( readyBound ) { return; }
readyBound = true;
// Catch cases where $(document).ready() is called after the
}
});
- // 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() {
- if ( jQuery.isReady ) {
- return;
- }
+ var toplevel = false;
- try {
- // If IE is used, use the trick by Diego Perini
- // http://javascript.nwbox.com/IEContentLoaded/
- document.documentElement.doScroll("left");
- } catch( error ) {
- setTimeout( arguments.callee, 0 );
- return;
- }
+ try {
+ toplevel = window.frameElement == null;
+ } catch(e){}
- // and execute any waiting functions
- jQuery.ready();
- })();
+ if ( document.documentElement.doScroll && toplevel ) {
+ (function() {
+ if ( jQuery.isReady ) {
+ return;
+ }
+
+ try {
+ // If IE is used, use the trick by Diego Perini
+ // http://javascript.nwbox.com/IEContentLoaded/
+ document.documentElement.doScroll("left");
+ } catch( error ) {
+ setTimeout( arguments.callee, 0 );
+ return;
+ }
+
+ // and execute any waiting functions
+ jQuery.ready();
+ })();
+ }
}
// A fallback to window.onload, that will always work