Minor Fixes

1John419 · Nov 14, 2022 · e46a044 · e46a044
1 parent e140d3b
commit e46a044
Show file tree

Hide file tree

Showing 45 changed files with 139 additions and 140 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /.gitignore
 /.vscode
 /ref
+/test
diff --git a/README.md b/README.md
@@ -11,10 +11,8 @@ Dedicated to our precious Lord and Saviour Jesus Christ.
 
 ALL the power belongs to My King! The glory is all His.
 
-
 > **Heaven and earth shall pass away, but my words shall not pass away.**
 
-
 ***
 
 The application supports Android, Linux, or Windows platforms with the latest version of a Chromium-based browser.
@@ -27,4 +25,4 @@ It should also support the latest version of the Safari browser, but has not bee
 
 ### Contact
 
-`[email protected]`
+`[email protected]`
diff --git a/bundle.js b/bundle.js
diff --git a/css/pb.css → css/kjv.css b/css/pb.css → css/kjv.css
@@ -52,7 +52,7 @@ h3 {
 }
 
 hr {
-  border-color: var(--ui-base-fg);
+  border-top: 1px solid var(--ui-base-fg);
 }
 
 html {

diff --git a/help/about.html b/help/about.html
@@ -8,7 +8,7 @@ <h1>KJV</h1>
   <blockquote><strong>Heaven and earth shall pass away, but my words shall not pass away.</strong></blockquote>
   <hr>
   <h1>Version</h1>
-  <p>2022.11.12</p>
+  <p>2022.11.14</p>
   <h1>Contact</h1>
   <p>[email protected]</p>
   <h1>Source Code</h1>

diff --git a/help/bookmark.html b/help/bookmark.html
@@ -43,6 +43,7 @@ <h3>Expand Mode</h3>
     </div>
   </div>
   <br>
+  <p>When Expand Mode is on, verse text for each bookmark is displayed</p>
   <h2>Folder Pane</h2>
   <p>The Folder pane displays the bookmark folder list.</p>
   <p>Tap a folder name to set the Active Folder and open the List pane.</p>

diff --git a/help/navigator.html b/help/navigator.html
@@ -3,7 +3,7 @@ <h1>Navigator Window</h1>
   <p>The Navigator window is the primary means to set the Active Chapter.</p>
   <p>The Navigator Window has two task panes: Book and Chapter.</p>
   <h2>Book Pane</h2>
-  <p>The Book pane displays the Bible book list.</p>
+  <p>The Book pane displays the KJV book list.</p>
   <p>Books are divided into two groups: those given before the Cross of Jesus Christ (the Hebrew Texts) and those given after the Cross of Jesus Christ (the Greek Texts).</p>
   <p>Book names are abbreviated to provide a compact format. The first three characters (excluding spaces) of the book name are used with following exceptions: JDG for Judges, SOL for Song of Solomon, and PHM for Philemon.</p>
   <p>Tap a book name to set the Active Book. The Active Book is highlighted.</p>

diff --git a/help/read.html b/help/read.html
@@ -1,6 +1,6 @@
 <div class="topic--read">
   <h1>Read Window</h1>
-  <p>The Read window is used to read the chapters of the Bible.</p>
+  <p>The Read window is used to read the chapters of the KJV.</p>
   <p>The Read window has a single task pane: Read.</p>
   <h2>Read Pane</h2>
   <p>The Read pane displays the verses of the Active Chapter.</p>

diff --git a/help/search.html b/help/search.html
@@ -1,6 +1,6 @@
 <div class="topic--search">
   <h1>Queries</h1>
-  <p>Queries allow you to search the Bible. Queries are performed on individual verses.</p>
+  <p>Queries allow you to search the KJV. Queries are performed on individual verses.</p>
   <p>Two query types are available: Word Query or Phrase Query.</p>
   <p>Word Queries are specified by a single word or a comma separated list of words. Query results will list all verses which contain all those words.</p>
   <p>For example, "forgive,sin" will find all verses that contain both "forgive" and "sin".</p>

diff --git a/index.html b/index.html
@@ -4,11 +4,11 @@
 <head>
   <meta charset="utf-8">
   <title>KJV</title>
-  <meta name="description" content="Offline King James Bible Search.">
+  <meta name="description" content="Offline King James Bible Search">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/png" href="/favicon.png">
   <link rel="manifest" href="/manifest.json">
-  <link rel="stylesheet" href="/css/pb.css">
+  <link rel="stylesheet" href="/css/kjv.css">
 </head>
 
 <body>

diff --git a/js/CommandQueue.js b/js/CommandQueue.js
@@ -38,6 +38,4 @@ class CommandQueue {
 
 }
 
-let queue = new CommandQueue();
-
-export default queue;
+export let queue = new CommandQueue();
diff --git a/js/Controller/BookmarkController.js b/js/Controller/BookmarkController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import { chapterIdxByVerseIdx } from '../data/tomeDb.js';
 
 class BookmarkController {

diff --git a/js/Controller/HelpController.js b/js/Controller/HelpController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 
 class HelpController {
 

diff --git a/js/Controller/NavigatorController.js b/js/Controller/NavigatorController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import { tomeBooks } from '../data/tomeDb.js';
 import {
   bookFirstChapterIdx,

diff --git a/js/Controller/ReadController.js b/js/Controller/ReadController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 
 const SIDEBAR_WIDTH = 320;
 

diff --git a/js/Controller/SearchController.js b/js/Controller/SearchController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import { chapterIdxByVerseIdx } from '../data/tomeDb.js';
 
 class SearchController {

diff --git a/js/Controller/SettingController.js b/js/Controller/SettingController.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 
 class SettingController {
 

diff --git a/js/Model/BookmarkModel.js b/js/Model/BookmarkModel.js
@@ -1,11 +1,11 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
-import { tomeName } from '../data/dbUtil.js';
+import { queue } from '../CommandQueue.js';
 import { appText } from '../data/language.js';
 import {
   tomeDb,
-  tomeVerseCount
+  tomeName,
+  tomeVerseCount,
 } from '../data/tomeDb.js';
 
 const numSortAscend = (a, b) => a - b;

diff --git a/js/Model/HelpModel.js b/js/Model/HelpModel.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 
 const validTasks = ['help-read', 'help-topic'];
 const validTopics = ['about', 'bookmark', 'help', 'navigator', 'overview',

diff --git a/js/Model/NavigatorModel.js b/js/Model/NavigatorModel.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   tomeChapters,
   tomeDb

diff --git a/js/Model/ReadModel.js b/js/Model/ReadModel.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 
 class ReadModel {
 

diff --git a/js/Model/SearchModel.js b/js/Model/SearchModel.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import { SearchEngine } from '../SearchEngine.js';
 import { tomeBinVerses } from '../data/binIdx.js';
 import { appText, defaultQuery } from '../data/language.js';

diff --git a/js/Model/SettingModel.js b/js/Model/SettingModel.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import { appText } from '../data/language.js';
 
 const validFontSizes = ['font-size--s', 'font-size--m', 'font-size--l',

diff --git a/js/View/BookmarkExportView.js b/js/View/BookmarkExportView.js
@@ -1,14 +1,14 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateDivDialog,
   templatePage,
   templateScroll,
   templateToolbarLower,
   templateToolbarUpper
 } from '../template.js';
-import { tomeName } from '../data/dbUtil.js';
+import { tomeName } from '../data/tomeDb.js';
 import { appText } from '../data/language.js'
 
 const dialogToolset = [

diff --git a/js/View/BookmarkFolderAddView.js b/js/View/BookmarkFolderAddView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateDivDialog,
   templateElement,

diff --git a/js/View/BookmarkFolderDeleteView.js b/js/View/BookmarkFolderDeleteView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateDivDialog,
   templatePage,

diff --git a/js/View/BookmarkFolderRenameView.js b/js/View/BookmarkFolderRenameView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateDivDialog,
   templateElement,

diff --git a/js/View/BookmarkFolderView.js b/js/View/BookmarkFolderView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateActionMenu,
   templateElement,

diff --git a/js/View/BookmarkImportView.js b/js/View/BookmarkImportView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateElement,
   templateDivDialog,

diff --git a/js/View/BookmarkListView.js b/js/View/BookmarkListView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateActionMenu,
   templateAcrostic,

diff --git a/js/View/BookmarkMoveCopyView.js b/js/View/BookmarkMoveCopyView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateActionMenu,
   templateBtnIcon,

diff --git a/js/View/HelpReadView.js b/js/View/HelpReadView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import { helpTopicList } from './HelpTopicView.js';
 import {
   templatePage,

diff --git a/js/View/HelpTopicView.js b/js/View/HelpTopicView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateElement,
   templatePage,

diff --git a/js/View/NavigatorBookView.js b/js/View/NavigatorBookView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateElement,
   templatePage,

diff --git a/js/View/NavigatorChapterView.js b/js/View/NavigatorChapterView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateElement,
   templatePage,

diff --git a/js/View/ReadView.js b/js/View/ReadView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateAcrostic,
   templateElement,

diff --git a/js/View/SearchFilterView.js b/js/View/SearchFilterView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateBtnIcon,
   templateElement,
@@ -24,15 +24,15 @@ import {
   tomeBinVerseCount,
   tomeBinWordCount
 } from '../data/binIdx.js';
-import { tomeName } from '../data/dbUtil.js';
 import { appText } from '../data/language.js';
 import {
+  tomeBooks,
   tomeChapters,
-  tomeBooks
+  tomeName,
 } from '../data/tomeDb.js';
 import {
   bookLongName,
-  chapterName
+  chapterName,
 } from '../data/tomeIdx.js';
 
 const lowerToolSet = [

diff --git a/js/View/SearchHistoryView.js b/js/View/SearchHistoryView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateBtnIcon,
   templateElement,

diff --git a/js/View/SearchLookupView.js b/js/View/SearchLookupView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateDivDialog,
   templateElement,

diff --git a/js/View/SearchResultView.js b/js/View/SearchResultView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateAcrostic,
   templateElement,
@@ -25,11 +25,11 @@ import {
   tomeBinVerses,
   tomeBinWordCount
 } from '../data/binIdx.js';
-import { tomeName } from '../data/dbUtil.js';
 import { appText } from '../data/language.js';
 import {
   tomeBooks,
   tomeChapters,
+  tomeName,
 } from '../data/tomeDb.js';
 import {
   bookLongName,

diff --git a/js/View/SettingView.js b/js/View/SettingView.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import queue from '../CommandQueue.js';
+import { queue } from '../CommandQueue.js';
 import {
   templateBtnIcon,
   templateElement,
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ h3 { @@
     }
     hr {
-      border-color: var(--ui-base-fg);
+      border-top: 1px solid var(--ui-base-fg);
     }
     html {
@@ Expand Down @@