library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ref #12652: Allow overriding native .click() suppression

Browse Source 
(cherry picked from commit 14b09ef98e)
This commit is contained in:
Richard Gibson 2013-04-06 22:56:03 -04:00
parent 1233fc7788
commit a120bbbfae
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/event.js
View File

@ -303,8 +303,8 @@ jQuery.event = {
// If nobody prevented the default action, do it now // If nobody prevented the default action, do it now
if ( !onlyHandlers && !event.isDefaultPrevented() ) { if ( !onlyHandlers && !event.isDefaultPrevented() ) {
if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) && if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) { jQuery.acceptData( elem ) ) {
// Call a native DOM method on the target with the same name name as the event. // Call a native DOM method on the target with the same name name as the event.
// Don't do default actions on window, that's where global variables be (#6170) // Don't do default actions on window, that's where global variables be (#6170)
@ -522,15 +522,6 @@ jQuery.event = {
// Prevent triggered image.load events from bubbling to window.load // Prevent triggered image.load events from bubbling to window.load
noBubble: true noBubble: true
}, },
click: {
// For checkbox, fire native event so checked state will be right
trigger: function() {
if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
this.click();
return false;
}
}
},
focus: { focus: {
// Fire native event if possible so blur/focus sequence is correct // Fire native event if possible so blur/focus sequence is correct
trigger: function() { trigger: function() {
@ -550,6 +541,20 @@ jQuery.event = {
}, },
delegateType: "focusout" delegateType: "focusout"
}, },
click: {
// For checkbox, fire native event so checked state will be right
trigger: function() {
if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
this.click();
return false;
}
},
// For cross-browser consistency, don't fire native .click() on links
_default: function( event ) {
return jQuery.nodeName( event.target, "a" );
}
},
beforeunload: { beforeunload: {
postDispatch: function( event ) { postDispatch: function( event ) {

41
test/unit/event.js
View File

@ -177,58 +177,57 @@ test("on(), multiple events at once and namespaces", function() {
test("on(), namespace with special add", function() { test("on(), namespace with special add", function() {
expect(27); expect(27);
var div = jQuery("<div/>").on("test", function(e) { var i = 0,
ok( true, "Test event fired." ); div = jQuery("<div/>").appendTo("#qunit-fixture").on( "test", function(e) {
}); ok( true, "Test event fired." );
});
var i = 0;
jQuery.event.special["test"] = { jQuery.event.special["test"] = {
_default: function(e, data) { _default: function( e, data ) {
equal( this, document, "Make sure we're at the top of the chain." ); equal( e.type, "test", "Make sure we're dealing with a test event." );
equal( e.type, "test", "And that we're still dealing with a test event." ); ok( data, "And that trigger data was passed." );
equal( e.target, div[0], "And that the target is correct." ); strictEqual( e.target, div[0], "And that the target is correct." );
ok( data !== undefined , "And that trigger data was passed." ); equal( this, window, "And that the context is correct." );
}, },
setup: function(){}, setup: function() {},
teardown: function(){ teardown: function() {
ok(true, "Teardown called."); ok( true, "Teardown called." );
}, },
add: function( handleObj ) { add: function( handleObj ) {
var handler = handleObj.handler; var handler = handleObj.handler;
handleObj.handler = function(e) { handleObj.handler = function( e ) {
e.xyz = ++i; e.xyz = ++i;
handler.apply( this, arguments ); handler.apply( this, arguments );
}; };
}, },
remove: function() { remove: function() {
ok(true, "Remove called."); ok( true, "Remove called." );
} }
}; };
div.on("test.a", {"x": 1}, function(e) { div.on( "test.a", { x: 1 }, function( e ) {
ok( !!e.xyz, "Make sure that the data is getting passed through." ); ok( !!e.xyz, "Make sure that the data is getting passed through." );
equal( e.data["x"], 1, "Make sure data is attached properly." ); equal( e.data["x"], 1, "Make sure data is attached properly." );
}); });
div.on("test.b", {"x": 2}, function(e) { div.on( "test.b", { x: 2 }, function( e ) {
ok( !!e.xyz, "Make sure that the data is getting passed through." ); ok( !!e.xyz, "Make sure that the data is getting passed through." );
equal( e.data["x"], 2, "Make sure data is attached properly." ); equal( e.data["x"], 2, "Make sure data is attached properly." );
}); });
// Should trigger 5 // Should trigger 5
div.trigger("test", 33.33); div.trigger( "test", 33.33 );
// Should trigger 2 // Should trigger 2
div.trigger("test.a", "George Harrison"); div.trigger( "test.a", "George Harrison" );
// Should trigger 2 // Should trigger 2
div.trigger("test.b", { year: 1982 }); div.trigger( "test.b", { year: 1982 } );
// Should trigger 4 // Should trigger 4
div.off("test"); div.off("test");
div = jQuery("<div/>").on("test", function(e) { div = jQuery("<div/>").on( "test", function( e ) {
ok( true, "Test event fired." ); ok( true, "Test event fired." );
}); });