Skip to content

Update cancel check to be shadowRoot compatible #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update cancel check to be shadowRoot compatible #2086

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a1b590
Update cancel check to be shadowRoot compatible
malarahfelipe Jun 10, 2022
b88cfde
Mouse: Update elIsCancel to use composedPath instead of event.target
malarahfelipe Jun 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ui/widgets/mouse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ return $.widget( "ui.mouse", {
}
},

/**
*
* @param {MouseEvent & { originalEvent: MouseEvent }} event
* @returns {boolean}
*/
_mouseDown: function( event ) {

// don't let more than one widget handle mouseStart
Expand All @@ -89,13 +94,18 @@ return $.widget( "ui.mouse", {

this._mouseDownEvent = event;

var first = (
event.originalEvent && event.originalEvent.composedPath ?
event.originalEvent.composedPath() : [ ]
)[ 0 ] || event.target;

var that = this,
btnIsLeft = ( event.which === 1 ),

// event.target.nodeName works around a bug in IE 8 with
// disabled inputs (#7620)
elIsCancel = ( typeof this.options.cancel === "string" && event.target.nodeName ?
$( event.target ).closest( this.options.cancel ).length : false );
elIsCancel = ( typeof this.options.cancel === "string" && first.nodeName ?
$( first ).closest( this.options.cancel ).length : false );
if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) {
return true;
}
Expand Down