Skip to content
Permalink
Browse files

Followup to #8753. Modify new Event constructor signature to jQuery.e…

…vent(type, props), which can be exploited by jQuery.event.trigger as well.
  • Loading branch information...
dmethvin committed Apr 12, 2011
1 parent 6d49e84 commit bebd8bc01e63dcb053412f8b247e4fa611867c55
Showing with 11 additions and 17 deletions.
  1. +9 −15 src/event.js
  2. +2 −2 test/unit/event.js
@@ -304,9 +304,9 @@ jQuery.event = {
// jQuery.Event object
event[ jQuery.expando ] ? event :
// Object literal
jQuery.extend( new jQuery.Event(type), event ) :
new jQuery.Event( type, event ) :
// Just the event type (string)
new jQuery.Event(type);
new jQuery.Event( type );

event.type = type;
event.namespace = namespaces.join(".");
@@ -563,26 +563,15 @@ jQuery.removeEvent = document.removeEventListener ?
}
};

jQuery.Event = function( src ) {
jQuery.Event = function( src, props ) {
// Allow instantiation without the 'new' keyword
if ( !this.preventDefault ) {
return new jQuery.Event( src );
return new jQuery.Event( src, props );
}

// Event object
if ( src && src.type ) {
this.originalEvent = src;

// Push explicitly provided properties onto the event object
for ( var prop in src ) {
// Ensure we don't clobber jQuery.Event prototype
// with own properties.
if ( hasOwn.call( src, prop ) ) {
this[ prop ] = src[ prop ];
}
}

// Always ensure a type has been explicitly set
this.type = src.type;

// Events bubbling up the document may have been marked as prevented
@@ -595,6 +584,11 @@ jQuery.Event = function( src ) {
this.type = src;
}

// Put explicitly provided properties onto the event object
if ( props ) {
jQuery.extend( this, props );
}

// timeStamp is buggy for some events on Firefox(#3843)
// So we won't rely on the native value
this.timeStamp = jQuery.now();
@@ -978,11 +978,11 @@ test("trigger(eventObject, [data], [fn])", function() {
$parent.unbind().remove();
});

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

expect(4);

var event = jQuery.Event({ type: "keydown", keyCode: 64 }),
var event = jQuery.Event( "keydown", { keyCode: 64 }),
handler = function( event ) {
ok( "keyCode" in event, "Special property 'keyCode' exists" );
equal( event.keyCode, 64, "event.keyCode has explicit value '64'" );

0 comments on commit bebd8bc

Please sign in to comment.
You can’t perform that action at this time.