Skip to content

Commit a1d6920

Browse files
committed
Mouse: Don't stop propagation of mouseup
Fixes #10818
1 parent ac81e39 commit a1d6920

File tree

3 files changed

+20
-3
lines changed

3 files changed

+20
-3
lines changed

tests/unit/draggable/core.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,4 +345,21 @@ test( "ui-draggable-handle managed correctly in nested draggables", function( as
345345
assert.hasClasses( child, "ui-draggable-handle", "child retains class name on destroy" );
346346
} );
347347

348+
test( "does not stop propagation to window", function( assert ) {
349+
expect( 1 );
350+
var element = $( "#draggable1" ).draggable();
351+
352+
var handler = function() {
353+
assert.ok( true, "mouseup propagates to window" );
354+
};
355+
$( window ).on( "mouseup", handler );
356+
357+
element.simulate( "drag", {
358+
dx: 10,
359+
dy: 10
360+
} );
361+
362+
$( window ).off( "mouseup", handler );
363+
} );
364+
348365
} );

ui/widgets/draggable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
255255
if ( !noPropagation ) {
256256
var ui = this._uiHash();
257257
if ( this._trigger( "drag", event, ui ) === false ) {
258-
this._mouseUp( {} );
258+
this._mouseUp( new $.Event( "mouseup", event ) );
259259
return false;
260260
}
261261
this.position = ui.position;
@@ -322,7 +322,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
322322
cancel: function() {
323323

324324
if ( this.helper.is( ".ui-draggable-dragging" ) ) {
325-
this._mouseUp( {} );
325+
this._mouseUp( new $.Event( "mouseup", { target: this.element[ 0 ] } ) );
326326
} else {
327327
this._clear();
328328
}

ui/widgets/mouse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ return $.widget( "ui.mouse", {
189189
}
190190

191191
mouseHandled = false;
192-
return false;
192+
event.preventDefault();
193193
},
194194

195195
_mouseDistanceMet: function( event ) {

0 commit comments

Comments
 (0)