jquery event:
* event objects have isDefaultPrevented, isPropagationStopped and isImmediatePropagationStopped methods. * Removed donative and dohandlers from $.trigger * event.result carries the last returned data from a handler(not undefined). * $.trigger doesn't keep bubbling if stopPropagation() is called. * Same event object is used all along for global trigger * Fixed the bug where target doesn't change when triggering on many elements. * The data array on $.trigger was accumulating objects as it bubbles. testrunner: adding more tests
This commit is contained in:
parent
0a846e5be6
commit
c0446c70d5
2 changed files with 153 additions and 85 deletions
135
src/event.js
135
src/event.js
|
@ -163,17 +163,32 @@ jQuery.event = {
|
|||
}
|
||||
},
|
||||
|
||||
trigger: function( e, data, elem, donative, extra) {
|
||||
trigger: function( event, data, elem, extra) {
|
||||
// Event object or event type
|
||||
var type = e.type || e;
|
||||
|
||||
var type = event.type || event;
|
||||
|
||||
event = typeof event === "object" ?
|
||||
// jQuery.Event object
|
||||
event[expando] ? event :
|
||||
// Object literal
|
||||
jQuery.extend( jQuery.Event(type), event ) :
|
||||
// Just the event type (string)
|
||||
jQuery.Event(type);
|
||||
|
||||
if ( type.indexOf("!") >= 0 ) {
|
||||
event.type = type = type.slice(0, -1);
|
||||
event.exclusive = true;
|
||||
}
|
||||
|
||||
// Handle a global trigger
|
||||
if ( !elem ) {
|
||||
// Don't bubble custom events when global (to avoid too much overhead)
|
||||
event.stopPropagation();
|
||||
// Only trigger if we've ever bound an event for it
|
||||
if ( this.global[type] )
|
||||
jQuery.each( jQuery.cache, function(){
|
||||
if ( this.events && this.events[type] )
|
||||
jQuery.event.trigger( e, data, this.handle.elem, false );
|
||||
jQuery.event.trigger( event, data, this.handle.elem );
|
||||
});
|
||||
|
||||
// Handle triggering a single element
|
||||
|
@ -185,42 +200,29 @@ jQuery.event = {
|
|||
|
||||
// Clone the incoming data, if any
|
||||
data = jQuery.makeArray(data);
|
||||
|
||||
if ( type.indexOf("!") >= 0 ) {
|
||||
type = type.slice(0, -1);
|
||||
var exclusive = true;
|
||||
}
|
||||
|
||||
e = typeof e === "object" ?
|
||||
// jQuery.Event object
|
||||
e[expando] ? e :
|
||||
// Object literal
|
||||
jQuery.extend( jQuery.Event(type), e ) :
|
||||
// Just the event type (string)
|
||||
jQuery.Event(type);
|
||||
|
||||
e.target = e.target || elem;
|
||||
e.currentTarget = elem;
|
||||
e.exclusive = exclusive;
|
||||
|
||||
data.unshift( e );
|
||||
|
||||
var val, ret, fn = jQuery.isFunction( elem[ type ] );
|
||||
// AT_TARGET phase (not bubbling)
|
||||
if( !event.target ){
|
||||
// Clean up in case it is reused
|
||||
event.result = undefined;
|
||||
event.target = elem;
|
||||
}
|
||||
|
||||
// Fix for custom events
|
||||
event.currentTarget = elem;
|
||||
|
||||
data.unshift( event );
|
||||
|
||||
var fn = jQuery.isFunction( elem[ type ] );
|
||||
|
||||
// Trigger the event, it is assumed that "handle" is a function
|
||||
var handle = jQuery.data(elem, "handle");
|
||||
if ( handle )
|
||||
val = handle.apply( elem, data );
|
||||
handle.apply( elem, data );
|
||||
|
||||
// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
|
||||
if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
|
||||
val = false;
|
||||
|
||||
if ( donative !== false && val !== false ) {
|
||||
var parent = elem.parentNode || elem.ownerDocument;
|
||||
if ( parent )
|
||||
jQuery.event.trigger(e, data, parent, donative);
|
||||
}
|
||||
event.result = false;
|
||||
|
||||
// Extra functions don't get the custom event object
|
||||
data.shift();
|
||||
|
@ -228,14 +230,14 @@ jQuery.event = {
|
|||
// 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
|
||||
ret = extra.apply( elem, val == null ? data : data.concat( val ) );
|
||||
var ret = extra.apply( elem, event.result == null ? data : data.concat( event.result ) );
|
||||
// if anything is returned, give it precedence and have it overwrite the previous value
|
||||
if ( ret !== undefined )
|
||||
val = ret;
|
||||
event.result = ret;
|
||||
}
|
||||
|
||||
// Trigger the native events (except for clicks on links)
|
||||
if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
|
||||
if ( event.target === elem && fn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
|
||||
this.triggered = true;
|
||||
try {
|
||||
elem[ type ]();
|
||||
|
@ -243,15 +245,22 @@ jQuery.event = {
|
|||
} catch (e) {}
|
||||
}
|
||||
|
||||
if ( !event.isPropagationStopped() ) {
|
||||
var parent = elem.parentNode || elem.ownerDocument;
|
||||
if ( parent )
|
||||
jQuery.event.trigger(event, data, parent);
|
||||
}
|
||||
|
||||
// Clean up, in case the event object is reused
|
||||
event.target = null;
|
||||
|
||||
this.triggered = false;
|
||||
}
|
||||
|
||||
return val;
|
||||
},
|
||||
|
||||
handle: function(event) {
|
||||
// returned undefined or false
|
||||
var val, ret, all, handlers;
|
||||
var all, handlers;
|
||||
|
||||
event = arguments[0] = jQuery.event.fix( event || window.event );
|
||||
|
||||
|
@ -276,23 +285,21 @@ jQuery.event = {
|
|||
event.handler = handler;
|
||||
event.data = handler.data;
|
||||
|
||||
ret = handler.apply( this, arguments );
|
||||
var ret = handler.apply(this, arguments);
|
||||
|
||||
if ( val !== false )
|
||||
val = ret;
|
||||
|
||||
if ( ret === false ) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
if( ret !== undefined ){
|
||||
event.result = ret;
|
||||
if ( ret === false ) {
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
}
|
||||
}
|
||||
|
||||
if( event._sip )
|
||||
if( event.isImmediatePropagationStopped() )
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return val;
|
||||
},
|
||||
|
||||
props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
|
||||
|
@ -403,10 +410,19 @@ jQuery.Event = function( src ){
|
|||
this[expando] = true;
|
||||
};
|
||||
|
||||
function returnFalse(){
|
||||
return false;
|
||||
}
|
||||
function returnTrue(){
|
||||
return true;
|
||||
}
|
||||
|
||||
// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
|
||||
// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
|
||||
jQuery.Event.prototype = {
|
||||
// add preventDefault and stopPropagation since
|
||||
// they will not work on the clone
|
||||
preventDefault: function() {
|
||||
this.isDefaultPrevented = returnTrue;
|
||||
|
||||
var e = this.originalEvent;
|
||||
if( !e )
|
||||
return;
|
||||
|
@ -417,6 +433,8 @@ jQuery.Event.prototype = {
|
|||
e.returnValue = false;
|
||||
},
|
||||
stopPropagation: function() {
|
||||
this.isPropagationStopped = returnTrue;
|
||||
|
||||
var e = this.originalEvent;
|
||||
if( !e )
|
||||
return;
|
||||
|
@ -427,9 +445,12 @@ jQuery.Event.prototype = {
|
|||
e.cancelBubble = true;
|
||||
},
|
||||
stopImmediatePropagation:function(){
|
||||
this._sip = true;
|
||||
this.isImmediatePropagationStopped = returnTrue;
|
||||
this.stopPropagation();
|
||||
}
|
||||
},
|
||||
isDefaultPrevented: returnFalse,
|
||||
isPropagationStopped: returnFalse,
|
||||
isImmediatePropagationStopped: returnFalse
|
||||
};
|
||||
// Checks if an event happened on an element within another element
|
||||
// Used in jQuery.event.special.mouseenter and mouseleave handlers
|
||||
|
@ -488,12 +509,18 @@ jQuery.fn.extend({
|
|||
|
||||
trigger: function( type, data, fn ) {
|
||||
return this.each(function(){
|
||||
jQuery.event.trigger( type, data, this, true, fn );
|
||||
jQuery.event.trigger( type, data, this, fn );
|
||||
});
|
||||
},
|
||||
|
||||
triggerHandler: function( type, data, fn ) {
|
||||
return this[0] && jQuery.event.trigger( type, data, this[0], false, fn );
|
||||
if( this[0] ){
|
||||
var event = jQuery.Event(type);
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
jQuery.event.trigger( event, data, this[0], fn );
|
||||
return event.result;
|
||||
}
|
||||
},
|
||||
|
||||
toggle: function( fn ) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue