diff --git a/src/event/event.js b/src/event/event.js index f264a2cd..b13e5a02 100644 --- a/src/event/event.js +++ b/src/event/event.js @@ -148,11 +148,15 @@ jQuery.event = { data.unshift( this.fix({ type: type, target: element }) ); // Trigger the event - if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false ) - this.triggered = true; + if ( jQuery.isFunction( element.$handle ) ) + val = element.$handle.apply( element, data ); + if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false ) + val = false; - if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) + if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) { + this.triggered = true; element[ type ](); + } this.triggered = false; } diff --git a/src/event/eventTest.js b/src/event/eventTest.js index d913b56e..7ac3a6ef 100644 --- a/src/event/eventTest.js +++ b/src/event/eventTest.js @@ -48,7 +48,7 @@ test("bind()", function() { }); test("click()", function() { - expect(3); + expect(4); $('