Skip to content

Title: Embeds: Use the click handler's own event parameter #13293

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

Closed
itzmekhokan wants to merge 3 commits into from
Closed

Title: Embeds: Use the click handler's own event parameter #13293

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a437528
Embeds: Use the click handler's own event parameter.
itzmekhokan Aug 27, 2026
fab4bfd
Embeds: Name the event handler parameters `event`.
itzmekhokan Aug 28, 2026
45e2866
Merge branch 'trunk' into fix/embed-global-event-param
peterwilsoncc Aug 30, 2026
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
44 changes: 23 additions & 21 deletions src/js/_enqueues/lib/embed-template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@

if ( share_input ) {
for ( i = 0; i < share_input.length; i++ ) {
share_input[ i ].addEventListener( 'click', function ( e ) {
e.target.select();
share_input[ i ].addEventListener( 'click', function ( event ) {
event.target.select();
} );
}
}
Expand Down Expand Up @@ -70,24 +70,24 @@
} );
}

function shareClickHandler( e ) {
function shareClickHandler( event ) {
var currentTab = document.querySelector( '.wp-embed-share-tab-button [aria-selected="true"]' );
currentTab.setAttribute( 'aria-selected', 'false' );
document.querySelector( '#' + currentTab.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'true' );

e.target.setAttribute( 'aria-selected', 'true' );
document.querySelector( '#' + e.target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' );
event.target.setAttribute( 'aria-selected', 'true' );
document.querySelector( '#' + event.target.getAttribute( 'aria-controls' ) ).setAttribute( 'aria-hidden', 'false' );
}

function shareKeyHandler( e ) {
var target = e.target,
function shareKeyHandler( event ) {
var target = event.target,
previousSibling = target.parentElement.previousElementSibling,
nextSibling = target.parentElement.nextElementSibling,
newTab, newTabChild;

if ( 37 === e.keyCode ) {
if ( 37 === event.keyCode ) {
newTab = previousSibling;
} else if ( 39 === e.keyCode ) {
} else if ( 39 === event.keyCode ) {
newTab = nextSibling;
} else {
return false;
Expand Down Expand Up @@ -119,24 +119,24 @@
}
}

document.addEventListener( 'keydown', function ( e ) {
if ( 27 === e.keyCode && -1 === share_dialog.className.indexOf( 'hidden' ) ) {
document.addEventListener( 'keydown', function ( event ) {
if ( 27 === event.keyCode && -1 === share_dialog.className.indexOf( 'hidden' ) ) {
closeSharingDialog();
} else if ( 9 === e.keyCode ) {
constrainTabbing( e );
} else if ( 9 === event.keyCode ) {
constrainTabbing( event );
}
}, false );

function constrainTabbing( e ) {
function constrainTabbing( event ) {
// Need to re-get the selected tab each time.
var firstFocusable = document.querySelector( '.wp-embed-share-tab-button [aria-selected="true"]' );

if ( share_dialog_close === e.target && ! e.shiftKey ) {
if ( share_dialog_close === event.target && ! event.shiftKey ) {
firstFocusable.focus();
e.preventDefault();
} else if ( firstFocusable === e.target && e.shiftKey ) {
event.preventDefault();
} else if ( firstFocusable === event.target && event.shiftKey ) {
share_dialog_close.focus();
e.preventDefault();
event.preventDefault();
}
}

Expand All @@ -154,13 +154,15 @@

/**
* Detect clicks to external (_top) links.
*
* @param {MouseEvent} event
*/
function linkClickHandler( e ) {
function linkClickHandler( event ) {
/*
* The href property resolves to an absolute URL, which the parent window requires.
* Elements whose href is not a string, such as SVG anchors, are skipped.
*/
var link = e.target.closest( '[href]' ),
var link = event.target.closest( '[href]' ),
href = 'string' === typeof link?.href ? link.href : null;

// Only catch clicks from the primary mouse button, without any modifiers.
Expand All @@ -171,7 +173,7 @@
// Send link target to the parent (embedding) site.
if ( href ) {
sendEmbedMessage( 'link', href );
e.preventDefault();
event.preventDefault();
}
}

Expand Down
Loading