X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=9dff1b2cd60c732a0199421e7c522700e1fc1f74;hb=15faf783b9c3c454868b5054fdcfb63e8950abf9;hp=23dbd6fd40e490e3ff06686b25ac3726f4d14cf4;hpb=b6d920cf05fae3dcfe515166013ce39411ac5e16;p=jquery.git diff --git a/src/event/event.js b/src/event/event.js index 23dbd6f..9dff1b2 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -130,7 +130,7 @@ jQuery.event = { if ( !element ) { // Only trigger if we've ever bound an event for it if ( this.global[type] ) - jQuery("*").trigger(type, data); + jQuery("*").add([window, document]).trigger(type, data); // Handle triggering a single element } else { @@ -142,9 +142,12 @@ jQuery.event = { // Trigger the event if ( jQuery.isFunction( element.$handle ) ) val = element.$handle.apply( element, data ); + + // Handle triggering native .onfoo handlers if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false ) val = false; + // Trigger the native events (except for clicks on links) if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) { this.triggered = true; element[ type ](); @@ -152,6 +155,8 @@ jQuery.event = { this.triggered = false; } + + return val; }, handle: function(event) { @@ -170,10 +175,14 @@ jQuery.event = { args[0].handler = c[j]; args[0].data = c[j].data; - if ( c[j].apply( this, args ) === false ) { + var tmp = c[j].apply( this, args ); + + if ( val !== false ) + val = tmp; + + if ( tmp === false ) { event.preventDefault(); event.stopPropagation(); - val = false; } } @@ -529,6 +538,9 @@ jQuery.fn.extend({ * @see $(Function) */ ready: function(f) { + // Attach the listeners + bindReady(); + // If the DOM is already ready if ( jQuery.isReady ) // Execute the function immediately @@ -928,7 +940,13 @@ jQuery.extend({ }; }); - + +var readyBound = false; + +function bindReady(){ + if ( readyBound ) return; + readyBound = true; + // If Mozilla is used if ( jQuery.browser.mozilla || jQuery.browser.opera ) // Use the handy event callback @@ -974,3 +992,4 @@ jQuery.extend({ // A fallback to window.onload, that will always work jQuery.event.add( window, "load", jQuery.ready ); +}