X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=a402340db833d064129a8af13ea2fb43f53382cf;hb=5ef3d5364d9372c825146c087e24af460f32ca1e;hp=81c193980bc16d7a8bc98b5a041e0dd285d0cac8;hpb=43f235f4257359dfcf9270cf31c56aa547d01fd3;p=jquery.git
diff --git a/src/event/event.js b/src/event/event.js
index 81c1939..a402340 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -12,38 +12,58 @@ jQuery.event = {
// around, causing it to be cloned in the process
if ( jQuery.browser.msie && element.setInterval != undefined )
element = window;
+
+ // if data is passed, bind to handler
+ if( data != undefined ) {
+ // Create temporary function pointer to original handler
+ var fn = handler;
+
+ // Create unique handler function, wrapped around original handler
+ handler = function() {
+ // Pass arguments and context to original handler
+ return fn.apply(this, arguments);
+ };
- // if data is passed, bind to handler
- if( data )
+ // Store data in unique handler
handler.data = data;
+ // Set the guid of unique handler to the same of original handler, so it can be removed
+ handler.guid = fn.guid;
+ }
+
// Make sure that the function being executed has a unique ID
- if ( !handler.guid )
+ if ( !handler.guid ) {
handler.guid = this.guid++;
+ // Don't forget to set guid for the original handler function
+ if (fn) fn.guid = handler.guid;
+ }
// Init the element's event structure
- if (!element.events)
- element.events = {};
+ if (!element.$events)
+ element.$events = {};
+
+ if (!element.$handle)
+ element.$handle = function() {
+ jQuery.event.handle.apply(element, arguments);
+ };
// Get the current list of functions bound to this event
- var handlers = element.events[type];
+ var handlers = element.$events[type];
- // If it hasn't been initialized yet
+ // Init the event handler queue
if (!handlers) {
- // Init the event handler queue
- handlers = element.events[type] = {};
-
- // Remember an existing handler, if it's already there
- if (element["on" + type])
- handlers[0] = element["on" + type];
+ handlers = element.$events[type] = {};
+
+ // And bind the global event handler to the element
+ if (element.addEventListener)
+ element.addEventListener(type, element.$handle, false);
+ else if (element.attachEvent)
+ element.attachEvent("on" + type, element.$handle);
}
// Add the function to the element's handler list
handlers[handler.guid] = handler;
- // And bind the global event handler to the element
- element["on" + type] = this.handle;
-
// Remember the function in a global list (for triggering)
if (!this.global[type])
this.global[type] = [];
@@ -55,18 +75,46 @@ jQuery.event = {
// Detach an event or set of events from an element
remove: function(element, type, handler) {
- if (element.events)
- if ( type && type.type )
- delete element.events[ type.type ][ type.handler.guid ];
- else if (type && element.events[type])
+ var events = element.$events, ret;
+
+ if ( events ) {
+ // type is actually an event object here
+ if ( type && type.type ) {
+ handler = type.handler;
+ type = type.type;
+ }
+
+ if ( !type ) {
+ for ( type in events )
+ this.remove( element, type );
+
+ } else if ( events[type] ) {
+ // remove the given handler for the given type
if ( handler )
- delete element.events[type][handler.guid];
+ delete events[type][handler.guid];
+
+ // remove all handlers for the given type
else
- for ( var i in element.events[type] )
- delete element.events[type][i];
- else
- for ( var j in element.events )
- this.remove( element, j );
+ for ( handler in element.$events[type] )
+ delete events[type][handler];
+
+ // remove generic event handler if no more handlers exist
+ for ( ret in events[type] ) break;
+ if ( !ret ) {
+ if (element.removeEventListener)
+ element.removeEventListener(type, element.$handle, false);
+ else if (element.detachEvent)
+ element.detachEvent("on" + type, 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;
+ }
},
trigger: function(type, data, element) {
@@ -81,19 +129,16 @@ jQuery.event = {
// Handle triggering a single element
else {
- var handler = element["on" + type ], val,
- fn = jQuery.isFunction( element[ type ] );
+ var val, ret, fn = jQuery.isFunction( element[ type ] || null );
+
+ // Pass along a fake event
+ data.unshift( this.fix({ type: type, target: element }) );
- if ( handler ) {
- // Pass along a fake event
- data.unshift( this.fix({ type: type, target: element }) );
-
- // Trigger the event
- if ( (val = handler.apply( element, data )) !== false )
- this.triggered = true;
- }
+ // Trigger the event
+ if ( (val = this.handle.apply( element, data )) !== false )
+ this.triggered = true;
- if ( fn && val !== false )
+ if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
element[ type ]();
this.triggered = false;
@@ -101,19 +146,18 @@ jQuery.event = {
},
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;
+ 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 || {} );
- // returned undefined or false
- var returnValue;
-
- var c = this.events[event.type];
-
- var args = [].slice.call( arguments, 1 );
+ var c = this.$events && this.$events[event.type], args = [].slice.call( arguments, 1 );
args.unshift( event );
for ( var j in c ) {
@@ -125,14 +169,16 @@ jQuery.event = {
if ( c[j].apply( this, args ) === false ) {
event.preventDefault();
event.stopPropagation();
- returnValue = false;
+ val = false;
}
}
// Clean up added properties in IE to prevent memory leak
- if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = event.handler = event.data = null;
+ if (jQuery.browser.msie)
+ event.target = event.preventDefault = event.stopPropagation =
+ event.handler = event.data = null;
- return returnValue;
+ return val;
},
fix: function(event) {
@@ -140,12 +186,33 @@ jQuery.event = {
if ( !event.target && event.srcElement )
event.target = event.srcElement;
+ // Add relatedTarget, if necessary
+ if ( !event.relatedTarget && event.fromElement )
+ event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement;
+
+ // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+ if ( event.metaKey == null && event.ctrlKey != null )
+ event.metaKey = event.ctrlKey;
+
+ // Add which for click: 1 == left; 2 == middle; 3 == right
+ // Note: button is not normalized, so don't use it
+ if ( event.which == null && event.button != null )
+ event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+
// Calculate pageX/Y if missing and clientX/Y available
- if ( event.pageX == undefined && event.clientX != undefined ) {
- var e = document.documentElement, b = document.body;
- event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft);
- event.pageY = event.clientY + (e.scrollTop || b.scrollTop);
+ 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;
}
+
+ // Add which for keypresses: keyCode
+ if ( (event.which == null || event.type == "keypress") && event.keyCode != null )
+ event.which = event.keyCode;
+
+ // If it's a keypress event, add charCode to IE
+ if ( event.charCode == null && event.type == "keypress" )
+ event.charCode = event.keyCode;
// check if target is a textnode (safari)
if (jQuery.browser.safari && event.target.nodeType == 3) {
@@ -192,7 +259,7 @@ jQuery.fn.extend({
*
* In most cases, you can define your event handlers as anonymous functions
* (see first example). In cases where that is not possible, you can pass additional
- * data as the second paramter (and the handler function as the third), see
+ * data as the second parameter (and the handler function as the third), see
* second example.
*
* @example $("p").bind("click", function(){
@@ -232,7 +299,7 @@ jQuery.fn.extend({
*/
bind: function( type, data, fn ) {
return this.each(function(){
- jQuery.event.add( this, type, fn || data, data );
+ jQuery.event.add( this, type, fn || data, fn && data );
});
},
@@ -267,7 +334,7 @@ jQuery.fn.extend({
jQuery.event.add( this, type, function(event) {
jQuery(this).unbind(event);
return (fn || data).apply( this, arguments);
- }, data);
+ }, fn && data);
});
},
@@ -307,7 +374,14 @@ jQuery.fn.extend({
},
/**
- * Trigger a type of event on every matched element.
+ * Trigger a type of event on every matched element. This will also cause
+ * the default action of the browser with the same name (if one exists)
+ * to be executed. For example, passing 'submit' to the trigger()
+ * function will also cause the browser to submit the form. This
+ * default action can be prevented by returning false from one of
+ * the functions bound to the event.
+ *
+ * You can also trigger custom events registered with bind.
*
* @example $("p").trigger("click")
* @before Hello
@@ -317,10 +391,13 @@ jQuery.fn.extend({
* // when a normal click fires, a and b are undefined
* // for a trigger like below a refers too "foo" and b refers to "bar"
* }).trigger("click", ["foo", "bar"]);
- * @desc Example of how to pass arbitrary to an event
+ * @desc Example of how to pass arbitrary data to an event
*
- * @before Hello
- * @result alert('hello')
+ * @example $("p").bind("myEvent",function(event,message1,message2) {
+ * alert(message1 + ' ' + message2);
+ * });
+ * $("p").trigger("myEvent",["Hello","World"]);
+ * @result alert('Hello World') // One for each paragraph
*
* @name trigger
* @type jQuery
@@ -360,7 +437,7 @@ jQuery.fn.extend({
return this.click(function(e) {
// Figure out which function to execute
- this.lastToggle = this.lastToggle == 0 ? 1 : 0;
+ this.lastToggle = 0 == this.lastToggle ? 1 : 0;
// Make sure that clicks stop
e.preventDefault();
@@ -384,9 +461,9 @@ jQuery.fn.extend({
* (a common error in using a mouseout event handler).
*
* @example $("p").hover(function(){
- * $(this).addClass("over");
+ * $(this).addClass("hover");
* },function(){
- * $(this).addClass("out");
+ * $(this).removeClass("hover");
* });
*
* @name hover
@@ -400,7 +477,7 @@ jQuery.fn.extend({
// A private function for handling mouse 'hovering'
function handleHover(e) {
// Check if mouse(over|out) are still within the same parent element
- var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
+ var p = e.relatedTarget;
// Traverse up the tree
while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; };
@@ -423,13 +500,13 @@ jQuery.fn.extend({
* the response times of your web applications.
*
* In a nutshell, this is a solid replacement for using window.onload,
- * and attaching a function to that. By using this method, your bound Function
+ * and attaching a function to that. By using this method, your bound function
* will be called the instant the DOM is ready to be read and manipulated,
- * which is exactly what 99.99% of all Javascript code needs to run.
+ * which is when what 99.99% of all JavaScript code needs to run.
*
* There is one argument passed to the ready event handler: A reference to
* the jQuery function. You can name that argument whatever you like, and
- * can therefore stick with the $ alias without risc of naming collisions.
+ * can therefore stick with the $ alias without risk of naming collisions.
*
* Please ensure you have no code in your <body> onload event handler,
* otherwise $(document).ready() may not fire.
@@ -442,7 +519,7 @@ jQuery.fn.extend({
* @example jQuery(function($) {
* // Your code using failsafe $ alias here...
* });
- * @desc Uses both the shortcut for $(document).ready() and the argument
+ * @desc Uses both the [[Core#.24.28_fn_.29|shortcut]] for $(document).ready() and the argument
* to write failsafe jQuery code using the $ alias, without relying on the
* global alias.
*
@@ -496,6 +573,9 @@ jQuery.extend({
// Remove event lisenter to avoid memory leak
if ( jQuery.browser.mozilla || jQuery.browser.opera )
document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
+
+ // Remove script element used by IE hack
+ jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
}
}
});
@@ -532,13 +612,15 @@ new function(){
/**
* Trigger the submit event of each matched element. This causes all of the functions
- * that have been bound to thet submit event to be executed.
+ * that have been bound to that submit event to be executed, and calls the browser's
+ * default submit action on the matching element(s). This default action can be prevented
+ * by returning false from one of the functions bound to the submit event.
*
* Note: This does not execute the submit method of the form element! If you need to
* submit the form via code, you have to use the DOM method, eg. $("form")[0].submit();
*
* @example $("form").submit();
- * @desc Triggers all submit events registered for forms, but does not submit the form
+ * @desc Triggers all submit events registered to the matched form(s), and submits them.
*
* @name submit
* @type jQuery
@@ -641,7 +723,9 @@ new function(){
/**
* Trigger the blur event of each matched element. This causes all of the functions
- * that have been bound to thet blur event to be executed.
+ * that have been bound to that blur event to be executed, and calls the browser's
+ * default blur action on the matching element(s). This default action can be prevented
+ * by returning false from one of the functions bound to the blur event.
*
* Note: This does not execute the blur method of the underlying elements! If you need to
* blur an element via code, you have to use the DOM method, eg. $("#myinput")[0].blur();
@@ -683,7 +767,9 @@ new function(){
/**
* Trigger the select event of each matched element. This causes all of the functions
- * that have been bound to thet select event to be executed.
+ * that have been bound to that select event to be executed, and calls the browser's
+ * default select action on the matching element(s). This default action can be prevented
+ * by returning false from one of the functions bound to the select event.
*
* @example $("p").select();
* @before Hello
@@ -867,7 +953,6 @@ new function(){
if ( script )
script.onreadystatechange = function() {
if ( this.readyState != "complete" ) return;
- this.parentNode.removeChild( this );
jQuery.ready();
};