diff --git a/core/misc/ajax.js b/core/misc/ajax.js index d7c776a706521689564fc46310894c4a8eb0bf5e..c5a35d33f660cb94d8859d69aff9661cf8bc37ce 100644 --- a/core/misc/ajax.js +++ b/core/misc/ajax.js @@ -745,8 +745,8 @@ // #ajax['keypress'] is TRUE. On a text-type widget a space should always // be a space. if ( - event.which === 13 || - (event.which === 32 && + event.key === 'Enter' || + (event.code === 'Space' && element.type !== 'text' && element.type !== 'textarea' && element.type !== 'tel' && diff --git a/core/modules/media_library/js/media_library.ui.js b/core/modules/media_library/js/media_library.ui.js index 10fe212f4a57af7ed7a51304fc21ee252575ea3b..c7423ea4ab0f6ae18ab2757c88258391ad21889b 100644 --- a/core/modules/media_library/js/media_library.ui.js +++ b/core/modules/media_library/js/media_library.ui.js @@ -59,7 +59,7 @@ .on('keypress', (e) => { // The AJAX link has the button role, so we need to make sure the link // is also triggered when pressing the space bar. - if (e.which === 32) { + if (e.code === 'Space') { e.preventDefault(); e.stopPropagation(); $(e.currentTarget).trigger('click'); diff --git a/core/modules/system/js/system.modules.js b/core/modules/system/js/system.modules.js index 5a166d84f1f6ed0a5fcada7a6d2b185abbcf2499..a0d6f59f48cff17e150cd334f11534145fc2d016 100644 --- a/core/modules/system/js/system.modules.js +++ b/core/modules/system/js/system.modules.js @@ -91,7 +91,7 @@ } function preventEnterKey(event) { - if (event.which === 13) { + if (event.key === 'Enter') { event.preventDefault(); event.stopPropagation(); } diff --git a/core/modules/user/js/user.permissions.js b/core/modules/user/js/user.permissions.js index e8a84607c592c6824710e2d475115cc552bc2d47..aa2ad7157eabc52732a1f47165204aeaa12c2e58 100644 --- a/core/modules/user/js/user.permissions.js +++ b/core/modules/user/js/user.permissions.js @@ -187,7 +187,7 @@ } function preventEnterKey(event) { - if (event.which === 13) { + if (event.key === 'Enter') { event.preventDefault(); event.stopPropagation(); } diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js index 6a85585339993913f63747fd211d7ace49e4f381..255359a311f523b64f9d0a3d471072f1a6275ecc 100644 --- a/core/modules/views_ui/js/views-admin.js +++ b/core/modules/views_ui/js/views-admin.js @@ -515,7 +515,7 @@ // Trap the ENTER key in the search box so that it doesn't submit the form. this.$searchBox.on('keypress', (event) => { - if (event.which === 13) { + if (event.key === 'Enter') { event.preventDefault(); } });