Commitbcaeb00

authored

Event: Avoid collisions between jQuery.event.special & Object.prototype

This is a follow-up to similar changes to data & event storages fromgh-4603.Closesgh-5235Refgh-4603

1 parentdfe212d commitbcaeb00Copy full SHA for bcaeb00

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ jQuery.event = {`
`429`	`429`	`newjQuery.Event(originalEvent);`
`430`	`430`	`},`
`431`	`431`
`432`		`-special:{`
	`432`	`+special:jQuery.extend(Object.create(null),{`
`433`	`433`	`load:{`
`434`	`434`
`435`	`435`	`// Prevent triggered image.load events from bubbling to window.load`
`@@ -494,7 +494,7 @@ jQuery.event = {`
`494`	`494`	`}`
`495`	`495`	`}`
`496`	`496`	`}`
`497`		`-}`
	`497`	`+})`
`498`	`498`	`};`
`499`	`499`
`500`	`500`	`// Ensure the presence of an event listener that handles manually-triggered`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2428,6 +2428,26 @@ QUnit.test( ".on and .off, selective mixed removal (trac-10705)", function( asse`
`2428`	`2428`	`.trigger("click");// 0`
`2429`	`2429`	`});`
`2430`	`2430`
	`2431`	`+QUnit.test("special interference with Object.prototype",function(assert){`
	`2432`	`+assert.expect(1);`
	`2433`	`+`
	`2434`	`+vartriggered=false;`
	`2435`	`+`
	`2436`	`+Object.prototype.jqfake={`
	`2437`	`+trigger:function(){`
	`2438`	`+triggered=true;`
	`2439`	`+}`
	`2440`	`+};`
	`2441`	`+`
	`2442`	`+jQuery("<div></div>")`
	`2443`	`+.appendTo("#qunit-fixture")`
	`2444`	`+.trigger("jqfake");`
	`2445`	`+`
	`2446`	`+deleteObject.prototype.jqfake;`
	`2447`	`+`
	`2448`	`+assert.ok(!triggered,"Object.prototype.jqfake.trigger not called");`
	`2449`	`+});`
	`2450`	`+`
`2431`	`2451`	`QUnit.test(".on( event-map, null-selector, data ) trac-11130",function(assert){`
`2432`	`2452`
`2433`	`2453`	`assert.expect(1);`

Comments

(0)