From 7df48174474863eefd10537dcc2e73d6755c2b08 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Wed, 23 May 2018 15:12:30 +0100 Subject: [PATCH] Koenig - Fix card selection after exiting blank container card refs https://github.com/TryGhost/Ghost/issues/9623 - it's necessary to pass a cursor movement to `deleteCard` for card selection after the delete to work - default to `CURSOR_AFTER` as it's the more typical direction compared to `NO_CURSOR_MOVEMENT` --- .../admin/lib/koenig-editor/addon/components/koenig-editor.js | 2 +- ghost/admin/lib/koenig-editor/addon/options/key-commands.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js index 320861ef0e..7174f034db 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-editor.js @@ -471,7 +471,7 @@ export default Component.extend({ this.set('linkRange', null); }, - deleteCard(card, cursorMovement = NO_CURSOR_MOVEMENT) { + deleteCard(card, cursorMovement = CURSOR_AFTER) { this.deleteCard(card, cursorMovement); }, diff --git a/ghost/admin/lib/koenig-editor/addon/options/key-commands.js b/ghost/admin/lib/koenig-editor/addon/options/key-commands.js index 4584f135af..b7b77a9be7 100644 --- a/ghost/admin/lib/koenig-editor/addon/options/key-commands.js +++ b/ghost/admin/lib/koenig-editor/addon/options/key-commands.js @@ -93,7 +93,7 @@ export const DEFAULT_KEY_COMMANDS = [{ // feels more natural if (isCollapsed && offset === 0 && section.prev && section.prev.type === 'card-section' && !section.isBlank) { let card = koenig.getCardFromSection(section.prev); - koenig.deleteCard(card, CURSOR_AFTER); + koenig.deleteCard(card); return; } @@ -152,7 +152,7 @@ export const DEFAULT_KEY_COMMANDS = [{ let selectNextCard = section.next.type === 'card-section'; let nextCard = koenig.getCardFromSection(section.next); - koenig.deleteCard(koenig.selectedCard, CURSOR_AFTER); + koenig.deleteCard(koenig.selectedCard); if (selectNextCard) { koenig.selectCard(nextCard);