mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-24 23:48:13 -05:00
🐛 Koenig - Fixed numpad Enter key not behaving like normal Enter key
refs https://github.com/TryGhost/Ghost/issues/9724 - `event.code` represents physical key location rather than the associated key value. Eg, `event.code` could be `NumpadEnter` rather than the expected `Enter` value - ensure we use `event.key` anywhere that we are acting on the key value so that re-mapped or virtual keys still work as expected
This commit is contained in:
parent
a97f100c87
commit
821a5d38ab
3 changed files with 7 additions and 7 deletions
|
@ -239,9 +239,9 @@ export default Component.extend({
|
|||
_handleKeydown(event) {
|
||||
if (
|
||||
this.isEditing
|
||||
&& event.code === 'Escape'
|
||||
|| (Browser.isMac() && event.code === 'Enter' && event.metaKey)
|
||||
|| (!Browser.isMac() && event.code === 'Enter' && event.ctrlKey)
|
||||
&& event.key === 'Escape'
|
||||
|| (Browser.isMac() && event.key === 'Enter' && event.metaKey)
|
||||
|| (!Browser.isMac() && event.key === 'Enter' && event.ctrlKey)
|
||||
) {
|
||||
// run the select card routine with isEditing=false to exit edit mode
|
||||
this.selectCard(false);
|
||||
|
|
|
@ -116,7 +116,7 @@ export default Component.extend({
|
|||
|
||||
actions: {
|
||||
inputKeydown(event) {
|
||||
if (event.code === 'Enter') {
|
||||
if (event.key === 'Enter') {
|
||||
// prevent Enter from triggering in the editor and removing text
|
||||
event.preventDefault();
|
||||
|
||||
|
@ -264,7 +264,7 @@ export default Component.extend({
|
|||
},
|
||||
|
||||
_handleKeydown(event) {
|
||||
if (event.code === 'Escape') {
|
||||
if (event.key === 'Escape') {
|
||||
this._cancelAndReselect();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -254,7 +254,7 @@ export default Component.extend({
|
|||
},
|
||||
|
||||
_handleKeydown(event) {
|
||||
if (event.code === 'Escape') {
|
||||
if (event.key === 'Escape') {
|
||||
// reset the caret position so we have a caret after closing
|
||||
this._moveCaretToCachedEditorRange();
|
||||
this._hideMenu();
|
||||
|
@ -262,7 +262,7 @@ export default Component.extend({
|
|||
}
|
||||
|
||||
let arrowKeys = ['ArrowUp', 'ArrowDown', 'ArrowLeft', 'ArrowRight'];
|
||||
if (arrowKeys.includes(event.code)) {
|
||||
if (arrowKeys.includes(event.key)) {
|
||||
this._hideMenu();
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Add table
Reference in a new issue