File tree Expand file tree Collapse file tree 5 files changed +12
-16
lines changed
Expand file tree Collapse file tree 5 files changed +12
-16
lines changed Original file line number Diff line number Diff line change @@ -168,13 +168,13 @@ Attachment = View.extend(/** @lends wp.media.view.Attachment.prototype */{
168168 }
169169
170170 // Catch arrow events.
171- if ( 37 === event . keyCode || 38 === event . keyCode || 39 === event . keyCode || 40 === event . keyCode ) {
171+ if ( 'ArrowUp' === event . key || 'ArrowDown' === event . key || 'ArrowLeft' === event . key || 'ArrowRight' === event . key ) {
172172 this . controller . trigger ( 'attachment:keydown:arrow' , event ) ;
173173 return ;
174174 }
175175
176176 // Catch enter and space events.
177- if ( 'keydown' === event . type && 13 !== event . keyCode && 32 !== event . keyCode ) {
177+ if ( 'keydown' === event . type && 'Enter' !== event . key && ' ' !== event . key ) {
178178 return ;
179179 }
180180
@@ -200,7 +200,7 @@ Attachment = View.extend(/** @lends wp.media.view.Attachment.prototype */{
200200 }
201201
202202 // Avoid toggles when the command or control key is pressed with the enter key to prevent deselecting the last selected attachment.
203- if ( ( event . metaKey || event . ctrlKey ) && ( 13 === event . keyCode || 10 === event . keyCode ) ) {
203+ if ( ( event . metaKey || event . ctrlKey ) && ( 'Enter' === event . key || ' ' === event . key ) ) {
204204 return ;
205205 }
206206
@@ -492,7 +492,7 @@ Attachment = View.extend(/** @lends wp.media.view.Attachment.prototype */{
492492 */
493493 removeFromLibrary : function ( event ) {
494494 // Catch enter and space events.
495- if ( 'keydown' === event . type && 13 !== event . keyCode && 32 !== event . keyCode ) {
495+ if ( 'keydown' === event . type && 'Enter' !== event . key && ' ' !== event . key ) {
496496 return ;
497497 }
498498
Original file line number Diff line number Diff line change @@ -258,7 +258,7 @@ Details = Attachment.extend(/** @lends wp.media.view.Attachment.Details.prototyp
258258 * @return {boolean|void } Returns false or undefined.
259259 */
260260 toggleSelectionHandler : function ( event ) {
261- if ( 'keydown' === event . type && 9 === event . keyCode && event . shiftKey && event . target === this . $ ( ':tabbable' ) . get ( 0 ) ) {
261+ if ( 'keydown' === event . type && 'Tab' === event . key && event . shiftKey && event . target === this . $ ( ':tabbable' ) . get ( 0 ) ) {
262262 this . controller . trigger ( 'attachment:details:shift-tab' , event ) ;
263263 return false ;
264264 }
Original file line number Diff line number Diff line change @@ -189,32 +189,28 @@ Attachments = View.extend(/** @lends wp.media.view.Attachments.prototype */{
189189 return ;
190190 }
191191
192- // Left arrow = 37.
193- if ( 37 === event . keyCode ) {
192+ if ( 'ArrowLeft' === event . key ) {
194193 if ( 0 === index ) {
195194 return ;
196195 }
197196 attachments . eq ( index - 1 ) . focus ( ) ;
198197 }
199198
200- // Up arrow = 38.
201- if ( 38 === event . keyCode ) {
199+ if ( 'ArrowUp' === event . key ) {
202200 if ( 1 === row ) {
203201 return ;
204202 }
205203 attachments . eq ( index - perRow ) . focus ( ) ;
206204 }
207205
208- // Right arrow = 39.
209- if ( 39 === event . keyCode ) {
206+ if ( 'ArrowRight' === event . key ) {
210207 if ( attachments . length === index ) {
211208 return ;
212209 }
213210 attachments . eq ( index + 1 ) . focus ( ) ;
214211 }
215212
216- // Down arrow = 40.
217- if ( 40 === event . keyCode ) {
213+ if ( 'ArrowDown' === event . key ) {
218214 if ( Math . ceil ( attachments . length / perRow ) === row ) {
219215 return ;
220216 }
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ var FocusManager = wp.media.View.extend(/** @lends wp.media.view.FocusManager.pr
8585 var tabbables ;
8686
8787 // Look for the tab key.
88- if ( 9 !== event . keyCode ) {
88+ if ( 'Tab' !== event . key ) {
8989 return ;
9090 }
9191
Original file line number Diff line number Diff line change @@ -261,11 +261,11 @@ EditAttachments = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.EditAtta
261261 }
262262
263263 // The right arrow key.
264- if ( 39 === event . keyCode ) {
264+ if ( 'ArrowRight' === event . key ) {
265265 this . nextMediaItem ( ) ;
266266 }
267267 // The left arrow key.
268- if ( 37 === event . keyCode ) {
268+ if ( 'ArrowLeft' === event . key ) {
269269 this . previousMediaItem ( ) ;
270270 }
271271 } ,
You can’t perform that action at this time.
0 commit comments