change for NET2full with morphology

STEPBible · Oct 10, 2024 · b073b2a · b073b2a
1 parent 5548334
commit b073b2a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/step-web/src/main/webapp/js/backbone/views/view_display_passage.js b/step-web/src/main/webapp/js/backbone/views/view_display_passage.js
@@ -37,13 +37,13 @@ var PassageDisplayView = DisplayView.extend({
             var bibleVersions = version.toUpperCase() + "," + extraVersions.toUpperCase();
             var r = step.util.getTestamentAndPassagesOfTheReferences(reference.split(" "));
             var justLoadedTOS = false;
-            if (((bibleVersions.indexOf('ESV') > -1) || (bibleVersions.indexOf('THOT') > -1) || (bibleVersions.indexOf('OHB') > -1) || (bibleVersions.indexOf('NASB2020') > -1) || (bibleVersions.indexOf("CUN") > -1) || (bibleVersions.indexOf('_MORPH') > -1)) &&
+            if (((bibleVersions.indexOf('ESV') > -1) || (bibleVersions.indexOf('THOT') > -1) || (bibleVersions.indexOf('OHB') > -1) || (bibleVersions.indexOf('NASB2020') > -1) || (bibleVersions.indexOf('NET2FULL') > -1) || (bibleVersions.indexOf("CUN") > -1)) &&
                 (r[1])) { // r[1] is a boolean for reference OT
                 justLoadedTOS = step.util.loadTOS();
                 hasTOS = true;
             }
             if (((bibleVersions.indexOf('ESV') > -1) || (bibleVersions.indexOf('KJV') > -1) ||
-                (bibleVersions.indexOf('SBLG') > -1) || (bibleVersions.indexOf('THGNT') > -1) || (bibleVersions.indexOf('CUN') > -1) || (bibleVersions.indexOf('NASB2020') > -1) || (bibleVersions.indexOf('_MORPH') > -1)) &&
+                (bibleVersions.indexOf('SBLG') > -1) || (bibleVersions.indexOf('THGNT') > -1) || (bibleVersions.indexOf('CUN') > -1) || (bibleVersions.indexOf('NASB2020') > -1) || (bibleVersions.indexOf('NET2FULL') > -1)) &&
                 (r[0])) // r[0] is a boolean for references with NT
                 hasNTMorph = true;
             if (this.partRendered) {

diff --git a/step-web/src/main/webapp/js/backbone/views/view_pick_bible.js b/step-web/src/main/webapp/js/backbone/views/view_pick_bible.js
@@ -96,7 +96,7 @@ var PickBibleView = Backbone.View.extend({
         '</div>' + //end dialog
         '</div>' +
         '</div>'),
-    suggestedEnglish: ['ESV', 'NIV', 'NASB2020', 'KJVA', 'NETfull', 'HCSB', 'BSB', 'ASV-TH', 'DRC', 'CPDV'],
+    suggestedEnglish: ['ESV', 'NIV', 'NASB2020', 'KJVA', 'NET2full', 'HCSB', 'BSB', 'ASV-TH', 'DRC', 'CPDV'],
     ancientBlackList: ["HebModern"],
     ancientOrder: [
         [__s.widely_used, ['THOT', 'LXX', 'THGNT', 'Byz', 'TR', 'SBLG']],

diff --git a/step-web/src/main/webapp/js/color_code_grammar.js b/step-web/src/main/webapp/js/color_code_grammar.js
@@ -1543,7 +1543,7 @@ var cf = {
           currentPos += 6;
           isOSHM = true;
         }
-        else if ((bibleVersions.indexOf("ESV") > -1) || (bibleVersions.indexOf("NASB2020") > -1) || (bibleVersions.indexOf("CUN") > -1)) // ESV has not "TOS:" in morph code
+        else if ((bibleVersions.indexOf("ESV") > -1) || (bibleVersions.indexOf("NASB2020") > -1) || (bibleVersions.indexOf("NET2FULL") > -1) || (bibleVersions.indexOf("CUN") > -1)) // ESV has not "TOS:" in morph code
           currentPos += 1;
         else
           continue;