Skip to content

Commit

Permalink
Fix #10375. Don't put type in jQuery.event.props
Browse files Browse the repository at this point in the history
It's already set in jQuery.Event, and copying it can clobber values set by the caller, e.g., the UI widget factory.
  • Loading branch information
dmethvin committed Sep 29, 2011
1 parent 22fcc77 commit 96a44a8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/event.js
Expand Up @@ -467,7 +467,7 @@ jQuery.event = {

// Includes some event props shared by KeyEvent and MouseEvent
// *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp type view which".split(" "),
props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),

propHooks: {},

Expand Down
5 changes: 4 additions & 1 deletion test/unit/event.js
Expand Up @@ -1101,7 +1101,7 @@ test("trigger(eventObject, [data], [fn])", function() {

test("jQuery.Event( type, props )", function() {

expect(4);
expect(5);

var event = jQuery.Event( "keydown", { keyCode: 64 }),
handler = function( event ) {
Expand All @@ -1111,6 +1111,9 @@ test("jQuery.Event( type, props )", function() {

// Supports jQuery.Event implementation
equal( event.type, "keydown", "Verify type" );

// ensure "type" in props won't clobber the one set by constructor
equal( jQuery.inArray("type", jQuery.event.props), -1, "'type' property not in props (#10375)" );

ok( "keyCode" in event, "Special 'keyCode' property exists" );

Expand Down

0 comments on commit 96a44a8

Please sign in to comment.