diff --git a/DynamicBibleIonic/src/components/words/words.scss b/DynamicBibleIonic/src/components/words/words.scss index 867002c6..52584942 100644 --- a/DynamicBibleIonic/src/components/words/words.scss +++ b/DynamicBibleIonic/src/components/words/words.scss @@ -14,6 +14,7 @@ background-color: #fceeee; margin: .3em; text-align: center; + cursor: pointer; } ion-scroll { diff --git a/DynamicBibleIonic/src/libs/Reference.ts b/DynamicBibleIonic/src/libs/Reference.ts index 8b103dec..1177db9a 100644 --- a/DynamicBibleIonic/src/libs/Reference.ts +++ b/DynamicBibleIonic/src/libs/Reference.ts @@ -397,6 +397,20 @@ export class Reference { return this.bookName(42); } + // must come before the Gospel of John + if (fbook.search(/\b(1|i|1st|first)\s*(john|jn|jo)\b/i) !== -1) + { + return this.bookName(62); + } + if (fbook.search(/\b(2|ii|2nd|second|sec)\s*(john|jn|jo)\b/i) !== -1) + { + return this.bookName(63); + } + if (fbook.search(/\b(3|iii|3rd|third)\s*(john|jn|jo)\b/i) !== -1) + { + return this.bookName(64); + } + // 1, 2, and 3rd John need to come before this one, else this will catch those book references. if (fbook.search(/\b(john|jn|jhn)\b/i) !== -1) { return this.bookName(43); @@ -473,18 +487,6 @@ export class Reference { return this.bookName(61); } - if (fbook.search(/\b(1|i|1st|first)\s*(john|jn|jo)\b/i) !== -1) - { - return this.bookName(62); - } - if (fbook.search(/\b(2|ii|2nd|second|sec)\s*(john|jn|jo)\b/i) !== -1) - { - return this.bookName(63); - } - if (fbook.search(/\b(3|iii|3rd|third)\s*(john|jn|jo)\b/i) !== -1) - { - return this.bookName(64); - } if (fbook.search(/\b(jude|ju)\b/i) !== -1) { return this.bookName(65);