Skip to content

Commit dd41979

Browse files
R1shabh-GuptaR1shabh-Gupta
committed
refactor: replace deprecated keyCode with key in event handlers in wp folder
1 parent 632ead6 commit dd41979

File tree

7 files changed

+39
-56
lines changed

7 files changed

+39
-56
lines changed

‎src/js/_enqueues/wp/code-editor.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,14 @@ if ( 'undefined' === typeof window.wp.codeEditor ) {
227227
$textarea.data( 'next-tab-blurs', false );
228228
});
229229
codemirror.on( 'keydown', function onKeydown( editor, event ) {
230-
var tabKeyCode = 9, escKeyCode = 27;
231-
232230
// Take note of the ESC keypress so that the next TAB can focus outside the editor.
233-
if ( escKeyCode === event.keyCode ) {
231+
if ( 'Escape' === event.key ) {
234232
$textarea.data( 'next-tab-blurs', true );
235233
return;
236234
}
237235

238236
// Short-circuit if tab key is not being pressed or the tab key press should move focus.
239-
if ( tabKeyCode !== event.keyCode || ! $textarea.data( 'next-tab-blurs' ) ) {
237+
if ( 'Tab' !== event.key || ! $textarea.data( 'next-tab-blurs' ) ) {
240238
return;
241239
}
242240

‎src/js/_enqueues/wp/customize/controls.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,17 +1778,17 @@
17781778
}
17791779

17801780
// Pressing the right arrow key fires a theme:next event.
1781-
if ( 39 === event.keyCode ) {
1781+
if ( 'ArrowRight' === event.key ) {
17821782
section.nextTheme();
17831783
}
17841784

17851785
// Pressing the left arrow key fires a theme:previous event.
1786-
if ( 37 === event.keyCode ) {
1786+
if ( 'ArrowLeft' === event.key ) {
17871787
section.previousTheme();
17881788
}
17891789

17901790
// Pressing the escape key fires a theme:collapse event.
1791-
if ( 27 === event.keyCode ) {
1791+
if ( 'Escape' === event.key ) {
17921792
if ( section.$body.hasClass( 'modal-open' ) ) {
17931793

17941794
// Escape from the details modal.
@@ -2637,7 +2637,7 @@
26372637

26382638
// Return if it's not the tab key
26392639
// When navigating with prev/next focus is already handled.
2640-
if ( 9 !== event.keyCode ) {
2640+
if ( 'Tab' !== event.key ) {
26412641
return;
26422642
}
26432643

@@ -5462,8 +5462,7 @@
54625462

54635463
// Prevent collapsing section when hitting Esc to tab out of editor.
54645464
control.editor.codemirror.on( 'keydown', function onKeydown( codemirror, event ) {
5465-
var escKeyCode = 27;
5466-
if ( escKeyCode === event.keyCode ) {
5465+
if ( 'Escape' === event.key ) {
54675466
event.stopPropagation();
54685467
}
54695468
});
@@ -5545,9 +5544,9 @@
55455544
} );
55465545

55475546
$textarea.on( 'keydown', function onKeydown( event ) {
5548-
var selectionStart, selectionEnd, value, tabKeyCode = 9, escKeyCode = 27;
5547+
var selectionStart, selectionEnd, value;
55495548

5550-
if ( escKeyCode === event.keyCode ) {
5549+
if ( 'Escape' === event.key ) {
55515550
if ( ! $textarea.data( 'next-tab-blurs' ) ) {
55525551
$textarea.data( 'next-tab-blurs', true );
55535552
event.stopPropagation(); // Prevent collapsing the section.
@@ -5556,7 +5555,7 @@
55565555
}
55575556

55585557
// Short-circuit if tab key is not being pressed or if a modifier key *is* being pressed.
5559-
if ( tabKeyCode !== event.keyCode || event.ctrlKey || event.altKey || event.shiftKey ) {
5558+
if ( 'Tab' !== event.key || event.ctrlKey || event.altKey || event.shiftKey ) {
55605559
return;
55615560
}
55625561

‎src/js/_enqueues/wp/editor/dfw.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,30 +1166,30 @@
11661166
*/
11671167
function fadeOut( event ) {
11681168
var isMac,
1169-
key = event && event.keyCode;
1169+
key = event && event.key;
11701170

11711171
if ( window.navigator.platform ) {
11721172
isMac = ( window.navigator.platform.indexOf( 'Mac' ) > -1 );
11731173
}
11741174

11751175
// Fade in and returns on Escape and keyboard shortcut Alt+Shift+W and Ctrl+Opt+W.
1176-
if ( key === 27 || ( key === 87 && event.altKey && ( ( ! isMac && event.shiftKey ) || ( isMac && event.ctrlKey ) ) ) ) {
1176+
if ( key === 'Escape' || ( key === 'w' && event.altKey && ( ( ! isMac && event.shiftKey ) || ( isMac && event.ctrlKey ) ) ) ) {
11771177
fadeIn( event );
11781178
return;
11791179
}
11801180

11811181
// Return if any of the following keys or combinations of keys is pressed.
11821182
if ( event && ( event.metaKey || ( event.ctrlKey && ! event.altKey ) || ( event.altKey && event.shiftKey ) || ( key && (
11831183
// Special keys ( tab, ctrl, alt, esc, arrow keys... ).
1184-
( key <= 47 && key !== 8 && key !== 13 && key !== 32 && key !== 46 ) ||
1184+
( ['Tab', 'Control', 'Alt', 'Shift', 'Escape', 'CapsLock', 'NumLock', 'ScrollLock', 'Pause', 'Insert', 'Home', 'End', 'PageUp', 'PageDown', 'ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight', 'PrintScreen'].includes(key) ) ||
11851185
// Windows keys.
1186-
( key >= 91 && key <= 93 ) ||
1186+
( ['Meta', 'OS', 'ContextMenu'].includes(key) ) ||
11871187
// F keys.
1188-
( key >= 112 && key <= 135 ) ||
1189-
// Num Lock, Scroll Lock, OEM.
1190-
( key >= 144 && key <= 150 ) ||
1188+
( /^F([1-9]|1[0-9]|2[0-4])$/.test(key) ) ||
11911189
// OEM or non-printable.
1192-
key >= 224
1190+
key.startsWith('Dead') ||
1191+
key === 'Unidentified' ||
1192+
key.length > 1 && !['Enter', 'Backspace', 'Delete', ' '].includes(key)
11931193
) ) ) ) {
11941194
return;
11951195
}
@@ -1446,7 +1446,7 @@
14461446
* @return {void}
14471447
*/
14481448
function toggleViaKeyboard( event ) {
1449-
if ( event.altKey && event.shiftKey && 87 === event.keyCode ) {
1449+
if ( event.altKey && event.shiftKey && 'w' === event.key ) {
14501450
toggle();
14511451
}
14521452
}

‎src/js/_enqueues/wp/theme-plugin-editor.js‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -523,19 +523,6 @@ wp.themePluginEditor = (function( $ ) {
523523

524524
elem = elem.nextElementSibling;
525525
}
526-
527-
this.keyCode = Object.freeze({
528-
RETURN: 13,
529-
SPACE: 32,
530-
PAGEUP: 33,
531-
PAGEDOWN: 34,
532-
END: 35,
533-
HOME: 36,
534-
LEFT: 37,
535-
UP: 38,
536-
RIGHT: 39,
537-
DOWN: 40
538-
});
539526
};
540527

541528
TreeitemLink.prototype.init = function () {
@@ -602,7 +589,7 @@ wp.themePluginEditor = (function( $ ) {
602589
}
603590

604591
if (event.shift) {
605-
if (event.keyCode == this.keyCode.SPACE || event.keyCode == this.keyCode.RETURN) {
592+
if (event.key == ' ' || event.key == 'Enter') {
606593
event.stopPropagation();
607594
this.stopDefaultClick = true;
608595
}
@@ -613,9 +600,9 @@ wp.themePluginEditor = (function( $ ) {
613600
}
614601
}
615602
else {
616-
switch (event.keyCode) {
617-
case this.keyCode.SPACE:
618-
case this.keyCode.RETURN:
603+
switch (event.key) {
604+
case ' ':
605+
case 'Enter':
619606
if (this.isExpandable) {
620607
if (this.isExpanded()) {
621608
this.tree.collapseTreeitem(this);
@@ -631,17 +618,17 @@ wp.themePluginEditor = (function( $ ) {
631618
}
632619
break;
633620

634-
case this.keyCode.UP:
621+
case 'ArrowUp':
635622
this.tree.setFocusToPreviousItem(this);
636623
flag = true;
637624
break;
638625

639-
case this.keyCode.DOWN:
626+
case 'ArrowDown':
640627
this.tree.setFocusToNextItem(this);
641628
flag = true;
642629
break;
643630

644-
case this.keyCode.RIGHT:
631+
case 'ArrowRight':
645632
if (this.isExpandable) {
646633
if (this.isExpanded()) {
647634
this.tree.setFocusToNextItem(this);
@@ -653,7 +640,7 @@ wp.themePluginEditor = (function( $ ) {
653640
flag = true;
654641
break;
655642

656-
case this.keyCode.LEFT:
643+
case 'ArrowLeft':
657644
if (this.isExpandable && this.isExpanded()) {
658645
this.tree.collapseTreeitem(this);
659646
flag = true;
@@ -666,12 +653,12 @@ wp.themePluginEditor = (function( $ ) {
666653
}
667654
break;
668655

669-
case this.keyCode.HOME:
656+
case 'Home':
670657
this.tree.setFocusToFirstItem();
671658
flag = true;
672659
break;
673660

674-
case this.keyCode.END:
661+
case 'End':
675662
this.tree.setFocusToLastItem();
676663
flag = true;
677664
break;

‎src/js/_enqueues/wp/theme.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ themes.view.Details = wp.Backbone.View.extend({
742742

743743
// Detect if the click is inside the overlay and don't close it
744744
// unless the target was the div.back button.
745-
if ( $( event.target ).is( '.theme-backdrop' ) || $( event.target ).is( '.close' ) || event.keyCode === 27 ) {
745+
if ( $( event.target ).is( '.theme-backdrop' ) || $( event.target ).is( '.close' ) || event.key === 'Escape' ) {
746746

747747
// Add a temporary closing class while overlay fades out.
748748
$( 'body' ).addClass( 'closing-overlay' );
@@ -1007,7 +1007,7 @@ themes.view.Preview = themes.view.Details.extend({
10071007

10081008
keyEvent: function( event ) {
10091009
// The escape key closes the preview.
1010-
if ( event.keyCode === 27 ) {
1010+
if ( event.key === 'Escape' ) {
10111011
this.undelegateEvents();
10121012
this.close();
10131013
}
@@ -1018,12 +1018,12 @@ themes.view.Preview = themes.view.Details.extend({
10181018
}
10191019

10201020
// The right arrow key, next theme.
1021-
if ( event.keyCode === 39 ) {
1021+
if ( event.key === 'ArrowRight' ) {
10221022
_.once( this.nextTheme() );
10231023
}
10241024

10251025
// The left arrow key, previous theme.
1026-
if ( event.keyCode === 37 ) {
1026+
if ( event.key === 'ArrowLeft' ) {
10271027
this.previousTheme();
10281028
}
10291029
},
@@ -1127,17 +1127,17 @@ themes.view.Themes = wp.Backbone.View.extend({
11271127
}
11281128

11291129
// Pressing the right arrow key fires a theme:next event.
1130-
if ( event.keyCode === 39 ) {
1130+
if ( event.key === 'ArrowRight' ) {
11311131
self.overlay.nextTheme();
11321132
}
11331133

11341134
// Pressing the left arrow key fires a theme:previous event.
1135-
if ( event.keyCode === 37 ) {
1135+
if ( event.key === 'ArrowLeft' ) {
11361136
self.overlay.previousTheme();
11371137
}
11381138

11391139
// Pressing the escape key fires a theme:collapse event.
1140-
if ( event.keyCode === 27 ) {
1140+
if ( event.key === 'Escape' ) {
11411141
self.overlay.collapse( event );
11421142
}
11431143
});

‎src/js/_enqueues/wp/updates.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2188,9 +2188,9 @@
21882188
* @param {Event} event Event interface.
21892189
*/
21902190
wp.updates.keydown = function( event ) {
2191-
if ( 27 === event.keyCode ) {
2191+
if ( 'Escape' === event.key ) {
21922192
wp.updates.requestForCredentialsModalCancel();
2193-
} else if ( 9 === event.keyCode ) {
2193+
} else if ( 'Tab' === event.key ) {
21942194

21952195
// #upgrade button must always be the last focus-able element in the dialog.
21962196
if ( 'upgrade' === event.target.id && ! event.shiftKey ) {

‎src/js/_enqueues/wp/widgets/custom-html.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,7 @@ wp.customHtmlWidgets = ( function( $ ) {
262262
// Prevent hitting Esc from collapsing the widget control.
263263
if ( wp.customize ) {
264264
control.editor.codemirror.on( 'keydown', function onKeydown( codemirror, event ) {
265-
var escKeyCode = 27;
266-
if ( escKeyCode === event.keyCode ) {
265+
if ( 'Escape' === event.key ) {
267266
event.stopPropagation();
268267
}
269268
});

0 commit comments

Comments
 (0)