Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/js/_enqueues/admin/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -1405,15 +1405,15 @@ $( function() {
var el = e.target, selStart, selEnd, val, scroll, sel;

// After pressing escape key (keyCode: 27), the tab key should tab out of the textarea.
if ( e.keyCode == 27 ) {
if ( e.key == 'Escape' ) {
// When pressing Escape: Opera 12 and 27 blur form fields, IE 8 clears them.
e.preventDefault();
$(el).data('tab-out', true);
return;
}

// Only listen for plain tab key (keyCode: 9) without any modifiers.
if ( e.keyCode != 9 || e.ctrlKey || e.altKey || e.shiftKey )
if ( e.key != 'Tab' || e.ctrlKey || e.altKey || e.shiftKey )
return;

// After tabbing out, reset it so next time the tab key can be used again.
Expand Down Expand Up @@ -1803,11 +1803,11 @@ $( function() {
if ( ! $wpwrap.hasClass( 'wp-responsive-open' ) ) {
return;
}
if ( 27 === event.keyCode ) {
if ( 'Escape' === event.key ) {
$( toggleButton ).trigger( 'click.wp-responsive' );
$( toggleButton ).find( 'a' ).trigger( 'focus' );
} else {
if ( 9 === event.keyCode ) {
if ( 'Tab' === event.key ) {
var sidebar = $( '#adminmenuwrap' )[0];
var focusedElement = event.relatedTarget || document.activeElement;
// A brief delay is required to allow focus to switch to another element.
Expand Down
2 changes: 1 addition & 1 deletion src/js/_enqueues/admin/post.js
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ jQuery( function($) {

// On [Enter] submit the taxonomy.
$('#new' + taxonomy).on( 'keypress', function(event){
if( 13 === event.keyCode ) {
if( 'Enter' === event.key ) {
event.preventDefault();
$('#' + taxonomy + '-add-submit').trigger( 'click' );
}
Expand Down
4 changes: 2 additions & 2 deletions src/js/_enqueues/admin/tags-box.js
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@
*/
xbutton.on( 'click keypress', function( e ) {
// On click or when using the Enter/Spacebar keys.
if ( 'click' === e.type || 13 === e.keyCode || 32 === e.keyCode ) {
if ( 'click' === e.type || 'Enter' === e.key || ' ' === e.key ) {
/*
* When using the keyboard, move focus back to the
* add new tag field. Note: when releasing the pressed
* key this will fire the `keyup` event on the input.
*/
if ( 13 === e.keyCode || 32 === e.keyCode ) {
if ( 'Enter' === e.key || ' ' === e.key ) {
$( this ).closest( '.tagsdiv' ).find( 'input.newtag' ).trigger( 'focus' );
}

Expand Down
4 changes: 2 additions & 2 deletions src/js/_enqueues/admin/tags-suggest.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,11 @@

$element.val( tags.join( separator + ' ' ) );

if ( $.ui.keyCode.TAB === event.keyCode ) {
if ( 'Tab' === event.key ) {
// Audible confirmation message when a tag has been selected.
window.wp.a11y.speak( wp.i18n.__( 'Term selected.' ), 'assertive' );
event.preventDefault();
} else if ( $.ui.keyCode.ENTER === event.keyCode ) {
} else if ( 'Enter' === event.key ) {
// If we're in the edit post Tags meta box, add the tag.
if ( window.tagBox ) {
window.tagBox.userAction = 'add';
Expand Down
2 changes: 1 addition & 1 deletion src/js/_enqueues/lib/comment-reply.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ window.addComment = ( function( window ) {

// Submit the comment form when the user types [Ctrl] or [Cmd] + [Enter].
var submitFormHandler = function( e ) {
if ( ( e.metaKey || e.ctrlKey ) && e.keyCode === 13 && document.activeElement.tagName.toLowerCase() !== 'a' ) {
if ( ( e.metaKey || e.ctrlKey ) && e.key === 'Enter' && document.activeElement.tagName.toLowerCase() !== 'a' ) {
commentFormElement.removeEventListener( 'keydown', submitFormHandler );
e.preventDefault();
// The submit button ID is 'submit' so we can't call commentFormElement.submit(). Click it instead.
Expand Down
8 changes: 4 additions & 4 deletions src/js/_enqueues/lib/embed-template.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@
nextSibling = target.parentElement.nextElementSibling,
newTab, newTabChild;

if ( 37 === e.keyCode ) {
if ( 'ArrowLeft' === e.key ) {
newTab = previousSibling;
} else if ( 39 === e.keyCode ) {
} else if ( 'ArrowRight' === e.key ) {
newTab = nextSibling;
} else {
return false;
Expand Down Expand Up @@ -120,9 +120,9 @@
}

document.addEventListener( 'keydown', function ( e ) {
if ( 27 === e.keyCode && -1 === share_dialog.className.indexOf( 'hidden' ) ) {
if ( 'Escape' === e.key && -1 === share_dialog.className.indexOf( 'hidden' ) ) {
closeSharingDialog();
} else if ( 9 === e.keyCode ) {
} else if ( 'Tab' === e.key ) {
constrainTabbing( e );
}
}, false );
Expand Down
10 changes: 5 additions & 5 deletions src/js/_enqueues/lib/image-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,15 @@
});

$('#imgedit-panel-' + postid).on( 'keypress', 'input[type="text"]', function(e) {
var k = e.keyCode;
var k = e.key;

// Key codes 37 through 40 are the arrow keys.
if ( 36 < k && k < 41 ) {
if ( 'ArrowLeft' === k || 'ArrowRight' === k || 'ArrowUp' === k || 'ArrowDown' === k ) {
$(this).trigger( 'blur' );
}

// The key code 13 is the Enter key.
if ( 13 === k ) {
if ( 'Enter' === k ) {
e.preventDefault();
e.stopPropagation();
return false;
Expand Down Expand Up @@ -319,9 +319,9 @@
$next = 0;
}
var target = false;
if ( event.keyCode === 40 ) {
if ( event.key === 'ArrowRight' ) {
target = $collection.get( $next );
} else if ( event.keyCode === 38 ) {
} else if ( event.key === 'ArrowUp' ) {
target = $collection.get( $prev );
}
if ( target ) {
Expand Down
10 changes: 5 additions & 5 deletions src/js/_enqueues/lib/link.js
Original file line number Diff line number Diff line change
Expand Up @@ -550,11 +550,11 @@
var fn, id;

// Escape key.
if ( 27 === event.keyCode ) {
if ( 'Escape' === event.key ) {
wpLink.close();
event.stopImmediatePropagation();
// Tab key.
} else if ( 9 === event.keyCode ) {
} else if ( 'Tab' === event.key ) {
id = event.target.id;

// wp-link-submit must always be the last focusable element in the dialog.
Expand All @@ -569,7 +569,7 @@
}

// Up Arrow and Down Arrow keys.
if ( event.shiftKey || ( 38 !== event.keyCode && 40 !== event.keyCode ) ) {
if ( event.shiftKey || ( 'ArrowUp' !== event.key && 'ArrowDown' !== event.key ) ) {
return;
}

Expand All @@ -579,7 +579,7 @@
}

// Up Arrow key.
fn = 38 === event.keyCode ? 'prev' : 'next';
fn = 'ArrowUp' === event.key ? 'prev' : 'next';
clearInterval( wpLink.keyInterval );
wpLink[ fn ]();
wpLink.keyInterval = setInterval( wpLink[ fn ], wpLink.keySensitivity );
Expand All @@ -588,7 +588,7 @@

keyup: function( event ) {
// Up Arrow and Down Arrow keys.
if ( 38 === event.keyCode || 40 === event.keyCode ) {
if ( 'ArrowUp' === event.key || 'ArrowDown' === event.key ) {
clearInterval( wpLink.keyInterval );
event.preventDefault();
}
Expand Down
2 changes: 1 addition & 1 deletion src/js/_enqueues/lib/nav-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@
$( '#custom-menu-item-url' ).removeAttr( 'aria-invalid' ).removeAttr( 'aria-describedby' );
$( '#custom-url-error' ).hide();

if ( e.keyCode === 13 ) {
if ( e.key === 'Enter' ) {
e.preventDefault();
$( '#submit-customlinkdiv' ).trigger( 'click' );
}
Expand Down
Loading