Psalms 119

1John419 · Dec 16, 2021 · 6d2b821 · 6d2b821
1 parent d5b7ef7
commit 6d2b821
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 103 deletions.
diff --git a/bundle.js b/bundle.js
@@ -4941,6 +4941,23 @@
   const svgNS = 'http://www.w3.org/2000/svg';
   const xlinkNS = 'http://www.w3.org/1999/xlink';
 
+  const templateAcrostic = (verseObj) => {
+    let acrosticSpan = undefined;
+    if (tomeAcrostics) {
+      let acrostic = tomeAcrostics[verseObj.k];
+      if (acrostic) {
+        let glyph = acrostic.slice(0, 1);
+        let xlit = acrostic.slice(1);
+        let glyphSpan = templateElement('span', 'font--hebrew', null, '', glyph);
+        let xlitSpan = templateElement('span', 'font--bold', null, '', xlit + ' ');
+        acrosticSpan = document.createDocumentFragment();
+        acrosticSpan.appendChild(glyphSpan);
+        acrosticSpan.appendChild(xlitSpan);
+      }
+    }
+    return acrosticSpan;
+  };
+
   const templateActionMenu = (modifier, actionSet) => {
     let actionMenu = templateElement(
       'div', 'action-menu', modifier, null, null);
@@ -5144,18 +5161,6 @@
       this.btnBookmark.classList.add('btn-icon--active');
     }
 
-    buildAcrosticSpan(verseIdx) {
-      let acrosticSpan = undefined;
-      if (tomeAcrostics) {
-        let acrostic = tomeAcrostics[verseIdx];
-        if (acrostic) {
-          acrosticSpan = templateElement(
-            'span', 'verse-acrostic', null, null, acrostic + ' ');
-        }
-      }
-      return acrosticSpan;
-    }
-
     buildPage() {
       this.page = templatePage('read');
       this.page.classList.remove('page--hide');
@@ -5183,7 +5188,7 @@
       verse.dataset.verseIdx = verseObj.k;
       let verseNum = this.buildVerseNum(verseObj);
       verse.appendChild(verseNum);
-      let acrostic = this.buildAcrosticSpan(verseObj.k);
+      let acrostic = templateAcrostic(verseObj);
       if (acrostic) {
         verse.appendChild(acrostic);
       }
@@ -9389,7 +9394,7 @@
       btn.dataset.verseIdx = verseObj.k;
       let searchText = document.createElement('span');
       searchText.classList.add('span-result-text');
-      let acrostic = this.buildAcrosticSpan(verseObj);
+      let acrostic = templateAcrostic(verseObj);
       let ref = this.buildRefSpan(verseObj);
       let text = document.createTextNode(verseObj.v[verseText]);
       searchText.appendChild(ref);
@@ -9431,19 +9436,6 @@
       }
     }
 
-    buildAcrosticSpan(verseObj) {
-      let acrosticSpan = undefined;
-      if (tomeAcrostics) {
-        let acrostic = tomeAcrostics[verseObj.k];
-        if (acrostic) {
-          acrosticSpan = document.createElement('span');
-          acrosticSpan.classList.add('verse-acrostic');
-          acrosticSpan.textContent = acrostic + ' ';
-        }
-      }
-      return acrosticSpan;
-    }
-
     buildPage() {
       this.page = templatePage('search-result');
 
@@ -9472,7 +9464,7 @@
 
     buildRefSpan(verseObj) {
       let refSpan = document.createElement('span');
-      refSpan.classList.add('verse-ref');
+      refSpan.classList.add('font--bold');
       refSpan.textContent = verseObj.v[verseCitation] + ' ';
       return refSpan;
     }
@@ -11870,7 +11862,7 @@
       btn.dataset.verseIdx = verseObj.k;
       let resultText = document.createElement('span');
       resultText.classList.add('span-search-text');
-      let acrostic = this.buildAcrosticSpan(verseObj);
+      let acrostic = templateAcrostic(verseObj);
       let ref = this.buildRefSpan(verseObj);
       resultText.appendChild(ref);
       if (acrostic) {
@@ -11920,19 +11912,6 @@
       }
     }
 
-    buildAcrosticSpan(verseObj) {
-      let acrosticSpan = undefined;
-      if (tomeAcrostics) {
-        let acrostic = tomeAcrostics[verseObj.k];
-        if (acrostic) {
-          acrosticSpan = document.createElement('span');
-          acrosticSpan.classList.add('verse-acrostic');
-          acrosticSpan.textContent = acrostic + ' ';
-        }
-      }
-      return acrosticSpan;
-    }
-
     buildPage() {
       this.page = templatePage('strong-result');
 
@@ -11966,7 +11945,7 @@
 
     buildRefSpan(verseObj) {
       let refSpan = document.createElement('span');
-      refSpan.classList.add('verse-ref');
+      refSpan.classList.add('font--bold');
       refSpan.textContent = verseObj.v[verseCitation] + ' ';
       return refSpan;
     }
@@ -13107,7 +13086,7 @@
 
       this.fontSample = templateElement('div', 'font-sample', null, null, null);
       this.fontSample.innerHTML = '<p class="font-sample-verse">' +
-        '<span class="verse-ref">1 John 4:19 </span>' +
+        '<span class="font--bold">1 John 4:19 </span>' +
         'We love him, because he first loved us.</p>';
       this.scroll.appendChild(this.fontSample);
 

diff --git a/css/kjs.css b/css/kjs.css
@@ -397,6 +397,10 @@ textarea {
   color: var(--ui-base-fg);
 }
 
+.font--bold {
+  font-weight: bold;
+}
+
 .icon-description {
   flex: 1 1 auto;
   align-self: center;
@@ -915,10 +919,6 @@ textarea {
   margin-top: 12.5px;
 }
 
-.verse-acrostic {
-  font-weight: bold;
-}
-
 .verse-last {
   height: 1px;
   width: 328px;
@@ -928,10 +928,6 @@ textarea {
   margin-right: 0.5em;
 }
 
-.verse-ref {
-  font-weight: bold;
-}
-
 .verse-text {
   min-height: calc(var(--target-size) - 0.5rem);
 }

diff --git a/help/about.html b/help/about.html
@@ -5,7 +5,7 @@ <h1>KJS</h1>
   <p>ALL the power belongs to My King! The glory is all His.</p>
   <p>"Heaven and earth shall pass away, but my words shall not pass away."</p>
   <h1>Version</h1>
-  <p>2021.12.10</p>
+  <p>2021.12.16</p>
   <h1>Contact</h1>
   <p>Questions or comments?</p>
   <a href="mailto:github.1john419@gmail.com?subject=KJS%20Feedback" target="_blank">Send email</a>

diff --git a/js/View/ReadView.js b/js/View/ReadView.js
@@ -2,7 +2,6 @@
 
 import queue from '../CommandQueue.js';
 import {
-  tomeAcrostics,
   tomeChapters
 } from '../data/tomeDb.js';
 import {
@@ -22,6 +21,7 @@ import {
   yahweh
 } from '../data/name.js';
 import {
+  templateAcrostic,
   templateElement,
   templateToolbarLower,
   templateToolbarMenu,
@@ -101,18 +101,6 @@ class ReadView {
     this.btnBookmark.classList.add('btn-icon--active');
   }
 
-  buildAcrosticSpan(verseIdx) {
-    let acrosticSpan = undefined;
-    if (tomeAcrostics) {
-      let acrostic = tomeAcrostics[verseIdx];
-      if (acrostic) {
-        acrosticSpan = templateElement(
-          'span', 'verse-acrostic', null, null, acrostic + ' ');
-      }
-    }
-    return acrosticSpan;
-  }
-
   buildPage() {
     this.page = templatePage('read');
     this.page.classList.remove('page--hide');
@@ -140,7 +128,7 @@ class ReadView {
     verse.dataset.verseIdx = verseObj.k;
     let verseNum = this.buildVerseNum(verseObj);
     verse.appendChild(verseNum);
-    let acrostic = this.buildAcrosticSpan(verseObj.k);
+    let acrostic = templateAcrostic(verseObj);
     if (acrostic) {
       verse.appendChild(acrostic);
     }

diff --git a/js/View/SearchResultView.js b/js/View/SearchResultView.js
@@ -17,7 +17,6 @@ import {
   tomeBinWordCount
 } from '../data/binIdx.js';
 import {
-  tomeAcrostics,
   tomeBooks,
   tomeChapters,
   tomeName
@@ -29,6 +28,7 @@ import {
   verseText
 } from '../data/tomeIdx.js';
 import {
+  templateAcrostic,
   templateElement,
   templatePage,
   templateScroll,
@@ -76,7 +76,7 @@ class SearchResultView {
     btn.dataset.verseIdx = verseObj.k;
     let searchText = document.createElement('span');
     searchText.classList.add('span-result-text');
-    let acrostic = this.buildAcrosticSpan(verseObj);
+    let acrostic = templateAcrostic(verseObj);
     let ref = this.buildRefSpan(verseObj);
     let text = document.createTextNode(verseObj.v[verseText]);
     searchText.appendChild(ref);
@@ -118,19 +118,6 @@ class SearchResultView {
     }
   }
 
-  buildAcrosticSpan(verseObj) {
-    let acrosticSpan = undefined;
-    if (tomeAcrostics) {
-      let acrostic = tomeAcrostics[verseObj.k];
-      if (acrostic) {
-        acrosticSpan = document.createElement('span');
-        acrosticSpan.classList.add('verse-acrostic');
-        acrosticSpan.textContent = acrostic + ' ';
-      }
-    }
-    return acrosticSpan;
-  }
-
   buildPage() {
     this.page = templatePage('search-result');
 
@@ -159,7 +146,7 @@ class SearchResultView {
 
   buildRefSpan(verseObj) {
     let refSpan = document.createElement('span');
-    refSpan.classList.add('verse-ref');
+    refSpan.classList.add('font--bold');
     refSpan.textContent = verseObj.v[verseCitation] + ' ';
     return refSpan;
   }

diff --git a/js/View/SettingView.js b/js/View/SettingView.js
@@ -127,7 +127,7 @@ class SettingView {
 
     this.fontSample = templateElement('div', 'font-sample', null, null, null);
     this.fontSample.innerHTML = '<p class="font-sample-verse">' +
-      '<span class="verse-ref">1 John 4:19 </span>' +
+      '<span class="font--bold">1 John 4:19 </span>' +
       'We love him, because he first loved us.</p>';
     this.scroll.appendChild(this.fontSample);
 

diff --git a/js/View/StrongResultView.js b/js/View/StrongResultView.js
@@ -22,7 +22,6 @@ import {
   mapStrongNums
 } from '../data/strongIdx.js';
 import {
-  tomeAcrostics,
   tomeBooks,
   tomeChapters,
   tomeName
@@ -34,6 +33,7 @@ import {
   verseText
 } from '../data/tomeIdx.js';
 import {
+  templateAcrostic,
   templateElement,
   templatePage,
   templateScroll,
@@ -83,7 +83,7 @@ class StrongResultView {
     btn.dataset.verseIdx = verseObj.k;
     let resultText = document.createElement('span');
     resultText.classList.add('span-search-text');
-    let acrostic = this.buildAcrosticSpan(verseObj);
+    let acrostic = templateAcrostic(verseObj);
     let ref = this.buildRefSpan(verseObj);
     resultText.appendChild(ref);
     if (acrostic) {
@@ -133,19 +133,6 @@ class StrongResultView {
     }
   }
 
-  buildAcrosticSpan(verseObj) {
-    let acrosticSpan = undefined;
-    if (tomeAcrostics) {
-      let acrostic = tomeAcrostics[verseObj.k];
-      if (acrostic) {
-        acrosticSpan = document.createElement('span');
-        acrosticSpan.classList.add('verse-acrostic');
-        acrosticSpan.textContent = acrostic + ' ';
-      }
-    }
-    return acrosticSpan;
-  }
-
   buildPage() {
     this.page = templatePage('strong-result');
 
@@ -179,7 +166,7 @@ class StrongResultView {
 
   buildRefSpan(verseObj) {
     let refSpan = document.createElement('span');
-    refSpan.classList.add('verse-ref');
+    refSpan.classList.add('font--bold');
     refSpan.textContent = verseObj.v[verseCitation] + ' ';
     return refSpan;
   }

diff --git a/js/template.js b/js/template.js
@@ -3,6 +3,27 @@
 const svgNS = 'http://www.w3.org/2000/svg';
 const xlinkNS = 'http://www.w3.org/1999/xlink';
 
+import {
+  tomeAcrostics,
+} from './data/tomeDb.js';
+
+export const templateAcrostic = (verseObj) => {
+  let acrosticSpan = undefined;
+  if (tomeAcrostics) {
+    let acrostic = tomeAcrostics[verseObj.k];
+    if (acrostic) {
+      let glyph = acrostic.slice(0, 1);
+      let xlit = acrostic.slice(1);
+      let glyphSpan = templateElement('span', 'font--hebrew', null, '', glyph);
+      let xlitSpan = templateElement('span', 'font--bold', null, '', xlit + ' ');
+      acrosticSpan = document.createDocumentFragment();
+      acrosticSpan.appendChild(glyphSpan);
+      acrosticSpan.appendChild(xlitSpan);
+    }
+  }
+  return acrosticSpan;
+};
+
 export const templateActionMenu = (modifier, actionSet) => {
   let actionMenu = templateElement(
     'div', 'action-menu', modifier, null, null);

diff --git a/sw.js b/sw.js
@@ -2,7 +2,7 @@ let appPrefix = 'kjs';
 
 let appCaches = [
   {
-    name: 'kjs-core-20211210.01',
+    name: 'kjs-core-20211216.01',
     urls: [
       './',
       './bundle.js',
@@ -16,7 +16,7 @@ let appCaches = [
     ]
   },
   {
-    name: 'kjs-css-20211210.01',
+    name: 'kjs-css-20211216.01',
     urls: [
       './css/kjs.css',
       './css/font.css'
@@ -36,7 +36,7 @@ let appCaches = [
     ]
   },
   {
-    name: 'kjs-help-20211210.01',
+    name: 'kjs-help-20211216.01',
     urls: [
       './help/about.html',
       './help/bookmark.html',