X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=88bbbda2b31771f0daafacb28bbb33614c34b889;hb=34355cd6986d5939dc711c531263cb561cba5f24;hp=b9f130b6c9f2ea3ce1413b379a046868ec111f46;hpb=39b0976e3ed605ec985a6171b059f20ad566808d;p=jquery.git diff --git a/src/event/event.js b/src/event/event.js index b9f130b..88bbbda 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -77,20 +77,20 @@ jQuery.event = { if ( !element ) { var g = this.global[type]; if ( g ) - for ( var i = 0, gl = g.length; i < gl; i++ ) - this.trigger( type, data, g[i] ); + jQuery.each( g, function(){ + jQuery.event.trigger( type, data, this ); + }); // Handle triggering a single element } else if ( element["on" + type] ) { - if ( element[ type ] && element[ type ].constructor == Function ) - element[ type ](); - else { - // Pass along a fake event - data.unshift( this.fix({ type: type, target: element }) ); + // Pass along a fake event + data.unshift( this.fix({ type: type, target: element }) ); - // Trigger the event - element["on" + type].apply( element, data ); - } + // Trigger the event + var val = element["on" + type].apply( element, data ); + + if ( val !== false && jQuery.isFunction( element[ type ] ) ) + element[ type ](); } }, @@ -468,8 +468,9 @@ jQuery.extend({ // If there are functions bound, to execute if ( jQuery.readyList ) { // Execute all of them - for ( var i = 0; i < jQuery.readyList.length; i++ ) - jQuery.readyList[i].apply( document ); + jQuery.each( jQuery.readyList, function(){ + this.apply( document ); + }); // Reset the list of functions jQuery.readyList = null;