Commit a55a0657 authored by Curtis Adam's avatar Curtis Adam

Merge branch...

Merge branch '53-hitting-return-key-in-a-one-line-text-field-should-have-the-same-effect-as-hitting-the-tab-key' into 'staging'

Resolve "Hitting RETURN key in a one-line text field should have the same effect as hitting the TAB key"

Closes #53

See merge request arsnova/cards!93
parents 3733c390 7b4e5c99
...@@ -317,8 +317,10 @@ export let CardNavigation = class CardNavigation { ...@@ -317,8 +317,10 @@ export let CardNavigation = class CardNavigation {
keyCodes = [9]; keyCodes = [9];
} }
if (Route.isEditMode()) { if (Route.isEditMode()) {
if ($('.learningGoalLevelButton').is(":focus")) { if ($('#subjectEditor').is(":focus")) {
keyCodes = [9, 37, 39]; keyCodes = [9, 13];
} else if ($('.learningGoalLevelButton').is(":focus")) {
keyCodes = [9, 13, 37, 39];
} else { } else {
keyCodes = [9]; keyCodes = [9];
} }
...@@ -352,6 +354,9 @@ export let CardNavigation = class CardNavigation { ...@@ -352,6 +354,9 @@ export let CardNavigation = class CardNavigation {
} }
} }
break; break;
case 13:
CardEditor.setEditorButtonFocus();
break;
case 32: case 32:
if (CardNavigation.isVisible()) { if (CardNavigation.isVisible()) {
if (Route.isCardset() || Route.isPresentationOrDemo()) { if (Route.isCardset() || Route.isPresentationOrDemo()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment