Fix #2834 ("My Notes" window syncs only per chapter)

AndBible · Sep 12, 2023 · 78088cd · 78088cd
1 parent c6b5d49
commit 78088cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/app/bibleview-js/src/components/documents/MyNotesDocument.vue b/app/bibleview-js/src/components/documents/MyNotesDocument.vue
@@ -23,8 +23,14 @@
   <div v-else>
     <h2>{{ document.verseRange }}</h2>
   </div>
-  <div class="note-container verse" v-for="b in notes" :key="b.id" :id="`o-${b.ordinalRange[0]}`">
-    <MyNoteRow :bookmark="b"/>
+  <div
+      class="note-container ordinal"
+      v-for="b in notes"
+      :key="b.id"
+      :id="`o-${b.ordinalRange[0]}`"
+      :data-ordinal="b.ordinalRange[0]"
+  >
+      <MyNoteRow :bookmark="b"/>
   </div>
 </template>
 

diff --git a/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt b/app/src/main/java/net/bible/android/view/activity/page/BibleView.kt
@@ -1321,7 +1321,7 @@ class BibleView(val mainBibleActivity: MainBibleActivity,
     private fun replaceDocument() {
         Log.i(TAG, "replaceDocument")
         val documentStr = latestDocumentStr
-        val verse = if(isBible) initialKey as? Verse else null
+        val verse = if(isBible || isMyNotes) initialKey as? Verse else null
         synchronized(this) {
             needsDocument = false
             contentVisible = true
@@ -1803,6 +1803,8 @@ class BibleView(val mainBibleActivity: MainBibleActivity,
     }
 
     private val isBible get() = firstDocument is BibleDocument
+    private val isCommentary get() = (firstDocument as? OsisDocument)?.book?.bookCategory == BookCategory.COMMENTARY
+    private val isMyNotes get() = firstDocument is MyNotesDocument
 
     val verseRangeLoaded: VerseRange? get() {
         val key = (firstKey as? Verse)?: return null