Merge branch 'master' of https://github.com/STEPBible/step

STEPBible · Nov 18, 2023 · b3f2672 · b3f2672
2 parents 1b437b0 + d876c47
commit b3f2672
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/step-core/src/main/resources/step.core.properties b/step-core/src/main/resources/step.core.properties
@@ -49,6 +49,7 @@ app.versions.stepPrefix.Geneva1599=Gen
 app.versions.stepPrefix.Godbey=Godb
 app.versions.stepPrefix.GodsWord=GodW
 app.versions.stepPrefix.Jubilee2000=Jub
+app.versions.stepPrefix.LSB_sbOnly=LSB
 app.versions.stepPrefix.LXX_th=LXX
 app.versions.stepPrefix.LXX2012=LXX2
 app.versions.stepPrefix.Leeser=Lees
@@ -172,6 +173,8 @@ app.versions.shortName.LBLA=La Biblia de las Am\u00E9ricas 1997 in Spanish
 app.versions.shortName.LEB=Lexham English Bible 2012 
 app.versions.shortName.Leeser=Leeser Old Testament 1853 
 app.versions.shortName.LO=The Living Oracles NT 
+app.versions.shortName.LSB_sbOnly=Legacy Standard Bible
+app.versions.shortName.LSB=Legacy Standard Bible
 app.versions.shortName.LXX=Septuagint ed Rahlfs from ancient manuscripts 1935 OT
 app.versions.shortName.Mal1865=Malagasy Bible 1865 in Malagasy
 app.versions.shortName.ManxGaelic=Manx Gaelic Scripture Portions (Est, Jon, Mat, Luk, Jhn) in Manx

diff --git a/step-web/src/main/webapp/js/backbone/views/view_sidebar.js b/step-web/src/main/webapp/js/backbone/views/view_sidebar.js
@@ -725,7 +725,8 @@ var SidebarView = Backbone.View.extend({
 							.append(relatedNosToDisplay[i].gloss)
                             .append(step.util.formatSearchResultRange(relatedNosToDisplay[i]._searchResultRange, false))
                             .data("strongNumber", relatedNosToDisplay[i].strongNumber));                        
-                    }                    ul.append(li);
+                    }
+                    ul.append(li);
                     matchingExpression += relatedNosToDisplay[i].strongNumber + " ";
                 }
             }

diff --git a/step-web/src/main/webapp/js/step.util.js b/step-web/src/main/webapp/js/step.util.js
@@ -1767,21 +1767,18 @@ step.util = {
 													'<div class="hidden-xs col-sm-1 heading"><h1><%= ot ? __s.OT : __s.NT %></h1></div>' +
 													'<% _.each(rows, function(row, i) { %>' +
 													'<span data-strong="<%= row.strongData.strongNumber %>">' +
-													'<a href="javascript:void(0)" class="definition col-xs-8 col-sm-4 <%= i % 2 == 1 ? "even" : "" %>"><%= row.strongData.gloss %> ' +
+													'<a onclick="javascript:void(0)" class="definition col-xs-8 col-sm-4 <%= i % 2 == 1 ? "even" : "" %>"><%= row.strongData.gloss %> ' +
 													'(<span class="transliteration"><%= row.strongData.stepTransliteration %></span> - <%= row.strongData.matchingForm %>)</a>' +
-													'<a href="javascript:void(0)" class="bookCount col-xs-2 col-sm-1"><%= sprintf("%d&times;", row.counts.book) %></a>' +
-													'<a href="javascript:void(0)" class="bibleCount col-xs-2 col-sm-1"><%= sprintf("%d&times;", row.counts.bible) %></a>' +
+													'<a onclick="javascript:void(0)" class="bookCount col-xs-2 col-sm-1"><%= sprintf("%d&times;", row.counts.book) %></a>' +
+													'<a onclick="javascript:void(0)" class="bibleCount col-xs-2 col-sm-1"><%= sprintf("%d&times;", row.counts.bible) %></a>' +
 													'</span><% }); %>' +
 													'<% if(rows.length % 2 == 1) { %>' +
-													// The "&nbsp;" in the following line has caused the Chrome browser to run into an infinite loop.  This issued was discovered in September 2019.
-													//                                        '<span class="even">&nbsp;</span>' +
-													// Removed the "&nbsp;" to resolve the Chrome browser issue
 													'<span class="even"></span>' +
 													'<% } %>' +
 													'</div>' +
-													'<div class="verseVocabLinks"><a href="javascript:void(0)" class="relatedVerses"><%= __s.see_related_verses %></a> ' +
-													'<a href="javascript:void(0)" class="relatedSubjects"><%= __s.see_related_subjects%></a> ' +
-													'<% if(isSearch) { %><a href="javascript:void(0)" class="verseInContext"><%= __s.see_verse_in_context %></a><% } %></div>';
+													'<div class="verseVocabLinks"><a onclick="javascript:void(0)" class="relatedVerses"><%= __s.see_related_verses %></a> ' +
+													'<a onclick="javascript:void(0)" class="relatedSubjects"><%= __s.see_related_subjects%></a> ' +
+													'<% if(isSearch) { %><a onclick="javascript:void(0)" class="verseInContext"><%= __s.see_verse_in_context %></a><% } %></div>';
 											var rows = [];
 											// Check step.userLanguageCode and $.getURlvar
 											var urlLang = $.getUrlVar("lang");

diff --git a/step-web/src/main/webapp/start.jsp b/step-web/src/main/webapp/start.jsp
@@ -205,12 +205,6 @@
     <%
         }
     %>
-
-    <% if (!appManager.isLocal()) { %>
-    <script type="text/javascript">
-        var _prum = [['id', '52698a2cabe53d8c20000000'], ['mark', 'firstbyte', (new Date()).getTime()]];
-    </script>
-    <% } %>
 </head>
 <!-- The following line has to use background and color style.  Using stepFgBg class does not work for the side panel.  -->
 <body xmlns:fb="http://ogp.me/ns/fb#" style="background-color:var(--clrBackground);color:var(--clrText)">