From b2fdf8fce38f025b2496535493c1e5f9411f7e65 Mon Sep 17 00:00:00 2001 From: davidmoore1 Date: Wed, 15 Jan 2025 10:07:32 -0500 Subject: [PATCH 1/3] Hangs when selecting book with no chapter 1 --- src/lib/components/BookSelector.svelte | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/components/BookSelector.svelte b/src/lib/components/BookSelector.svelte index 3a61b4726..b1977adf3 100644 --- a/src/lib/components/BookSelector.svelte +++ b/src/lib/components/BookSelector.svelte @@ -43,7 +43,10 @@ The navbar component. let count = Object.keys(books.find((x) => x.bookCode === book).versesByChapters).length; return count; } - + function firstChapter(book) { + let first = Object.keys(books.find((x) => x.bookCode === book).versesByChapters)[0]; + return first; + } function getVerseCount(chapter, chapters) { if (!chapter || chapter === 'i' || !chapters || Object.keys(chapters).length === 0) { return 0; @@ -79,7 +82,8 @@ The navbar component. $nextRef.chapter = 'i'; await completeNavigation(); } - $nextRef.chapter = '1'; + const first = firstChapter($nextRef.book); + $nextRef.chapter = first; if (count === 1) { await completeNavigation(); } From 9bccb8104986f948d37bcbeb440c916a47950eb9 Mon Sep 17 00:00:00 2001 From: davidmoore1 Date: Wed, 15 Jan 2025 10:13:32 -0500 Subject: [PATCH 2/3] Simplify code. --- src/lib/components/BookSelector.svelte | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/components/BookSelector.svelte b/src/lib/components/BookSelector.svelte index b1977adf3..63132776c 100644 --- a/src/lib/components/BookSelector.svelte +++ b/src/lib/components/BookSelector.svelte @@ -82,8 +82,7 @@ The navbar component. $nextRef.chapter = 'i'; await completeNavigation(); } - const first = firstChapter($nextRef.book); - $nextRef.chapter = first; + $nextRef.chapter = firstChapter($nextRef.book); if (count === 1) { await completeNavigation(); } From f6181406b8ac60562245005877e3c188116186fb Mon Sep 17 00:00:00 2001 From: davidmoore1 Date: Wed, 15 Jan 2025 10:32:22 -0500 Subject: [PATCH 3/3] added break for clarification --- src/lib/components/BookSelector.svelte | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/components/BookSelector.svelte b/src/lib/components/BookSelector.svelte index 63132776c..f5bdef9ef 100644 --- a/src/lib/components/BookSelector.svelte +++ b/src/lib/components/BookSelector.svelte @@ -81,6 +81,7 @@ The navbar component. if (count === 0) { $nextRef.chapter = 'i'; await completeNavigation(); + break; } $nextRef.chapter = firstChapter($nextRef.book); if (count === 1) {