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

Event: HTML5 drop events inherit from MouseEvent

Browse Source 
Fixes gh-2009
Ref gh-1925
(cherry picked from commit d7e5fcee51)

Conflicts:
	test/unit/event.js
This commit is contained in:
Dave Methvin 2015-01-14 14:34:09 -05:00
parent 87bb713cc0
commit a05de404d8
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event.js
View File

@ -12,7 +12,7 @@ define([
var rformElems = /^(?:input|select|textarea)$/i, var rformElems = /^(?:input|select|textarea)$/i,
rkeyEvent = /^key/, rkeyEvent = /^key/,
rmouseEvent = /^(?:mouse|pointer|contextmenu|drag)|click/, rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
rtypenamespace = /^([^.]*)(?:\.(.+)|)/; rtypenamespace = /^([^.]*)(?:\.(.+)|)/;

19
test/unit/event.js
View File

@ -2481,21 +2481,26 @@ test("fixHooks extensions", function() {
// this test in IE8 since a native HTML5 drag event will never occur there. // this test in IE8 since a native HTML5 drag event will never occur there.
if ( document.createEvent ) { if ( document.createEvent ) {
test( "drag events copy over mouse related event properties (gh-1925)", function() { test( "drag/drop events copy mouse-related event properties (gh-1925, gh-2009)", function() {
expect( 2 ); expect( 4 );
var $fixture = jQuery( "<div id='drag-fixture'></div>" ).appendTo( "body" ); var $fixture = jQuery( "<div id='drag-fixture'></div>" ).appendTo( "body" );
$fixture.on( "dragmove", function( evt ) { $fixture.on( "dragmove", function( evt ) {
ok( "pageX" in evt, "checking for pageX property" ); ok( "pageX" in evt, "checking for pageX property on dragmove" );
ok( "pageY" in evt, "checking for pageY property" ); ok( "pageY" in evt, "checking for pageY property on dragmove" );
}); });
fireNative( $fixture[ 0 ], "dragmove" ); fireNative( $fixture[ 0 ], "dragmove" );
$fixture.unbind( "dragmove" ).remove();
$fixture.on( "drop", function( evt ) {
ok( "pageX" in evt, "checking for pageX property on drop" );
ok( "pageY" in evt, "checking for pageY property on drop" );
});
fireNative( $fixture[ 0 ], "drop" );
$fixture.unbind( "dragmove drop" ).remove();
}); });
} }
test( "focusin using non-element targets", function() { test( "focusin using non-element targets", function() {
expect( 2 ); expect( 2 );