diff --git a/internal/template/templates/common/feed_list.html b/internal/template/templates/common/feed_list.html index 5ff37c0a..d6b0adc4 100644 --- a/internal/template/templates/common/feed_list.html +++ b/internal/template/templates/common/feed_list.html @@ -3,7 +3,8 @@ {{ range .feeds }}

@@ -15,7 +16,7 @@ {{ .Title }}

- + {{ plural "page.unread_entry_count" .UnreadCount .UnreadCount }} diff --git a/internal/template/templates/views/bookmark_entries.html b/internal/template/templates/views/bookmark_entries.html index 9ab03d83..a5657b43 100644 --- a/internal/template/templates/views/bookmark_entries.html +++ b/internal/template/templates/views/bookmark_entries.html @@ -23,6 +23,7 @@ class="item entry-item {{ if $.user.EntrySwipe }}entry-swipe{{ end }} item-status-{{ .Status }}" data-id="{{ .ID }}" aria-labelledby="entry-title-{{ .ID }}" + tabindex="-1" >

diff --git a/internal/template/templates/views/categories.html b/internal/template/templates/views/categories.html index 6cc050e4..5ffe6538 100644 --- a/internal/template/templates/views/categories.html +++ b/internal/template/templates/views/categories.html @@ -26,6 +26,7 @@

diff --git a/internal/template/templates/views/category_entries.html b/internal/template/templates/views/category_entries.html index 42e56b50..7ba7bedb 100644 --- a/internal/template/templates/views/category_entries.html +++ b/internal/template/templates/views/category_entries.html @@ -70,6 +70,7 @@ class="item entry-item {{ if $.user.EntrySwipe }}entry-swipe{{ end }} item-status-{{ .Status }}" data-id="{{ .ID }}" aria-labelledby="entry-title-{{ .ID }}" + tabindex="-1" >

diff --git a/internal/template/templates/views/feed_entries.html b/internal/template/templates/views/feed_entries.html index 469eb794..9252ffcf 100644 --- a/internal/template/templates/views/feed_entries.html +++ b/internal/template/templates/views/feed_entries.html @@ -97,6 +97,7 @@ class="item entry-item {{ if $.user.EntrySwipe }}entry-swipe{{ end }} item-status-{{ .Status }}" data-id="{{ .ID }}" aria-labelledby="entry-title-{{ .ID }}" + tabindex="-1" >

diff --git a/internal/template/templates/views/history_entries.html b/internal/template/templates/views/history_entries.html index 234d824b..8d6358ef 100644 --- a/internal/template/templates/views/history_entries.html +++ b/internal/template/templates/views/history_entries.html @@ -42,6 +42,7 @@ class="item entry-item {{ if $.user.EntrySwipe }}entry-swipe{{ end }} item-status-{{ .Status }}" data-id="{{ .ID }}" aria-labelledby="entry-title-{{ .ID }}" + tabindex="-1" >

diff --git a/internal/template/templates/views/shared_entries.html b/internal/template/templates/views/shared_entries.html index 849a4174..9aa09c80 100644 --- a/internal/template/templates/views/shared_entries.html +++ b/internal/template/templates/views/shared_entries.html @@ -39,6 +39,7 @@ class="item entry-item {{ if $.user.EntrySwipe }}entry-swipe{{ end }} item-status-{{ .Status }}" data-id="{{ .ID }}" aria-labelledby="entry-title-{{ .ID }}" + tabindex="-1" >

diff --git a/internal/template/templates/views/unread_entries.html b/internal/template/templates/views/unread_entries.html index 77063723..72511adb 100644 --- a/internal/template/templates/views/unread_entries.html +++ b/internal/template/templates/views/unread_entries.html @@ -50,6 +50,7 @@ class="item entry-item {{ if $.user.EntrySwipe }}entry-swipe{{ end }} item-status-{{ .Status }}" data-id="{{ .ID }}" aria-labelledby="entry-title-{{ .ID }}" + tabindex="-1" >

diff --git a/internal/ui/static/js/app.js b/internal/ui/static/js/app.js index 5e457183..cc3cbcbf 100644 --- a/internal/ui/static/js/app.js +++ b/internal/ui/static/js/app.js @@ -495,7 +495,7 @@ function goToListItem(offset) { if (document.querySelector(".current-item") === null) { items[0].classList.add("current-item"); - items[0].querySelector('.item-header a').focus(); + items[0].focus(); return; } @@ -507,7 +507,7 @@ function goToListItem(offset) { item.classList.add("current-item"); DomHelper.scrollPageTo(item); - item.querySelector('.item-header a').focus(); + item.focus(); break; }