handler.type = parts[1];
// Init the element's event structure
- if (!element.$events)
- element.$events = {};
+ var events = jQuery.data(element, "events") || jQuery.data(element, "events", {});
- if (!element.$handle)
- element.$handle = function() {
- // 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);
-
+ var handle = jQuery.data(element, "handle", function(){
+ // 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
- var handlers = element.$events[type];
+ var handlers = events[type];
// Init the event handler queue
if (!handlers) {
- handlers = element.$events[type] = {};
+ handlers = events[type] = {};
// And bind the global event handler to the element
if (element.addEventListener)
- element.addEventListener(type, element.$handle, false);
+ element.addEventListener(type, handle, false);
else
- element.attachEvent("on" + type, element.$handle);
+ element.attachEvent("on" + type, handle);
}
// Add the function to the element's handler list
// Detach an event or set of events from an element
remove: function(element, type, handler) {
- var events = element.$events, ret, index;
+ var events = jQuery.data(element, "events"), ret, index;
// Namespaced event handlers
if ( typeof type == "string" ) {
// remove all handlers for the given type
else
- for ( handler in element.$events[type] )
+ for ( handler in events[type] )
// Handle the removal of namespaced events
if ( !parts[1] || events[type][handler].type == parts[1] )
delete events[type][handler];
for ( ret in events[type] ) break;
if ( !ret ) {
if (element.removeEventListener)
- element.removeEventListener(type, element.$handle, false);
+ element.removeEventListener(type, jQuery.data(element, "handle"), false);
else
- element.detachEvent("on" + type, element.$handle);
+ element.detachEvent("on" + type, jQuery.data(element, "handle"));
ret = null;
delete events[type];
}
// Remove the expando if it's no longer used
for ( ret in events ) break;
- if ( !ret )
- element.$handle = element.$events = null;
+ if ( !ret ) {
+ jQuery.removeData( element, "events" );
+ jQuery.removeData( element, "handle" );
+ }
}
},
if ( evt )
data.unshift( this.fix({ type: type, target: element }) );
+ // Enforce the right trigger type
+ data[0].type = type;
+
// Trigger the event
- if ( jQuery.isFunction( element.$handle ) )
- val = element.$handle.apply( element, data );
+ if ( jQuery.isFunction( jQuery.data(element, "handle") ) )
+ val = jQuery.data(element, "handle").apply( element, data );
// Handle triggering native .onfoo handlers
if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
var parts = event.type.split(".");
event.type = parts[0];
- var c = this.$events && this.$events[event.type], args = Array.prototype.slice.call( arguments, 1 );
+ var c = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 );
args.unshift( event );
for ( var j in c ) {
// Calculate pageX/Y if missing and clientX/Y available
if ( event.pageX == null && event.clientX != null ) {
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);
+ event.pageX = event.clientX + (e && e.scrollLeft || b && b.scrollLeft || 0);
+ event.pageY = event.clientY + (e && e.scrollTop || b && b.scrollTop || 0);
}
// Add which for key events
// Remove event listener to avoid memory leak
if ( jQuery.browser.mozilla || jQuery.browser.opera )
document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
-
- // Remove script element used by IE hack
- if( !window.frames.length ) // don't remove if frames are present (#1187)
- jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
}
}
});
// Use the handy event callback
document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
- // If IE is used, use the excellent hack by Matthias Miller
- // http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited
- else if ( jQuery.browser.msie ) {
-
- // Only works if you document.write() it
- document.write("<scr" + "ipt id=__ie_init defer=true " +
- "src=//:><\/script>");
-
- // Use the defer script hack
- var script = document.getElementById("__ie_init");
-
- // script does not exist if jQuery is loaded dynamically
- if ( script )
- script.onreadystatechange = function() {
- if ( this.readyState != "complete" ) return;
- jQuery.ready();
- };
-
- // Clear from memory
- script = null;
-
- // If Safari is used
- } else if ( jQuery.browser.safari )
- // Continually check to see if the document.readyState is valid
- jQuery.safariTimer = setInterval(function(){
- // loaded and complete are both valid states
- if ( document.readyState == "loaded" ||
- document.readyState == "complete" ) {
-
- // If either one are found, remove the timer
- clearInterval( jQuery.safariTimer );
- jQuery.safariTimer = null;
+ // If Safari or IE is used
+ else
+ // Continually check to see if the document is ready
+ (function timer() {
+ try {
+ // If IE is used, use the excellent hack by Hedger Wang and Andrea Giammarchi
+ // http://www.3site.eu/jstests/onContent/DOMReadyAnddoScroll.php
+ if ( jQuery.browser.msie || document.readyState != "loaded" && document.readyState != "complete" )
+ document.firstChild.doScroll("left");
// and execute any waiting functions
jQuery.ready();
+ } catch( error ) {
+ setTimeout( timer, 0 );
}
- }, 10);
+ })();
// A fallback to window.onload, that will always work
jQuery.event.add( window, "load", jQuery.ready );
git.asbjorn.biz / jquery.git / blobdiff