diff --git a/src/routes/_components/NavShortcuts.html b/src/routes/_components/NavShortcuts.html index 0a4ffead..588d4e40 100644 --- a/src/routes/_components/NavShortcuts.html +++ b/src/routes/_components/NavShortcuts.html @@ -8,6 +8,10 @@ +{#if !$leftRightChangesFocus} + + +{/if} {#each $navPages as navPage, i} {/each} @@ -35,6 +39,21 @@ async showComposeDialog () { const showComposeDialog = await importShowComposeDialog() showComposeDialog() + }, + goLeftOrRight (left) { + let { currentPage, navPages } = this.store.get() + if (currentPage === 'notifications/mentions') { // special case + currentPage = 'notifications' + } + const idx = navPages.findIndex(_ => _.name === currentPage) + if (idx === -1) { + return + } + if (left && idx > 0) { + goto(navPages[idx - 1].href) + } else if (!left && idx < navPages.length - 1) { + goto(navPages[idx + 1].href) + } } } } diff --git a/src/routes/_components/ShortcutHelpInfo.html b/src/routes/_components/ShortcutHelpInfo.html index a18d82b2..5f7c7029 100644 --- a/src/routes/_components/ShortcutHelpInfo.html +++ b/src/routes/_components/ShortcutHelpInfo.html @@ -6,8 +6,19 @@ {@html `

Global

+ ${$leftRightChangesFocus ? + ` +
    +
  • to go to the next focusable element
  • +
  • to go to the previous focusable element
  • +
+ ` : ''}
    -
  • 1 - 6 to switch columns
  • +
  • + 1 - 6 + ${$leftRightChangesFocus ? '' : `or /`} + to switch columns +
  • 7 or c to compose a new toot
  • s to search
  • g + h to go home
  • @@ -40,7 +51,7 @@

    Media

      -
    • - to go to next or previous
    • +
    • / to go to next or previous
    `} @@ -83,7 +94,10 @@ }