deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

jquery event: removed the argument dohandlers from $.trigger. Uses another approach.

Browse source
This commit is contained in:
Ariel Flesler 2008-12-30 23:29:14 +00:00
parent 7138cf0ce0
commit 0a846e5be6
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/event.js
View file

@ -163,7 +163,7 @@ jQuery.event = {
} }
}, },
trigger: function( e, data, elem, donative, extra, dohandlers) { trigger: function( e, data, elem, donative, extra) {
// Event object or event type // Event object or event type
var type = e.type || e; var type = e.type || e;
@ -207,16 +207,14 @@ jQuery.event = {
var val, ret, fn = jQuery.isFunction( elem[ type ] ); var val, ret, fn = jQuery.isFunction( elem[ type ] );
if ( dohandlers !== false ) { // Trigger the event, it is assumed that "handle" is a function
// Trigger the event, it is assumed that "handle" is a function var handle = jQuery.data(elem, "handle");
var handle = jQuery.data(elem, "handle"); if ( handle )
if ( handle ) val = handle.apply( elem, data );
val = handle.apply( elem, data );
// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links) // 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 ) if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
val = false; val = false;
}
if ( donative !== false && val !== false ) { if ( donative !== false && val !== false ) {
var parent = elem.parentNode || elem.ownerDocument; var parent = elem.parentNode || elem.ownerDocument;
@ -551,15 +549,14 @@ jQuery.fn.extend({
}); });
function liveHandler( event ){ function liveHandler( event ){
var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"), stop = true; var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"),
stop = true;
jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){ jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){
if ( check.test(fn.type) ) { if ( check.test(fn.type) ) {
var elem = jQuery(event.target).closest(fn.data)[0]; var elem = jQuery(event.target).closest(fn.data)[0];
if ( elem ) { if ( elem && fn.call(elem, event, fn.data) === false )
var ret = jQuery.event.trigger( event.type, [event, fn.data], elem, false, fn, false ); stop = false;
if ( ret === false )
stop = false;
}
} }
}); });
return stop; return stop;