From b073b2ad22aff954b8e2c27aec38574498811f4b Mon Sep 17 00:00:00 2001 From: Patrick Tang Date: Thu, 10 Oct 2024 00:51:49 -0700 Subject: [PATCH] change for NET2full with morphology --- .../src/main/webapp/js/backbone/views/view_display_passage.js | 4 ++-- step-web/src/main/webapp/js/backbone/views/view_pick_bible.js | 2 +- step-web/src/main/webapp/js/color_code_grammar.js | 2 +- 3 files changed, 4 insertions(+), 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 index d1229baae3..b1b5454726 100644 --- 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 index 1c5678f0bf..f9d68f5937 100644 --- 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({ '' + //end dialog '' + ''), - 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 index 8b962b02bb..f0bca64ab2 100644 --- 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;