fix bugs

STEPBible · Mar 6, 2024 · 1b2b4cc · 1b2b4cc
1 parent 9211766
commit 1b2b4cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/step-web/pom.xml b/step-web/pom.xml
@@ -720,7 +720,7 @@
 									<replacement><token>_applyCssClassesRepeatByGroup([:(])</token><value>zX$1</value></replacement>
 									<replacement><token>getFeaturesLabel([:(])</token><value>zY$1</value></replacement>
 									<replacement><token>enhanceVerseNumbers([:(])</token><value>zZ$1</value></replacement>
-									<replacement><token>_addSubjectAndRelatedWordsPopup([:(])</token><value>za$1</value></replacement>
+									<replacement><token>_addSubjectAndRelatedWordsPopup([:(,])</token><value>za$1</value></replacement>
 									<replacement><token>showListOfVersesInQLexArea([:(])</token><value>zb$1</value></replacement>
 									<replacement><token>getFontForStrong([:(])</token><value>zc$1</value></replacement>
 									<replacement><token>addCollapsiblePanel([:(])</token><value>ze$1</value></replacement>

diff --git a/step-web/src/main/webapp/js/backbone/views/view_quick_lexicon.js b/step-web/src/main/webapp/js/backbone/views/view_quick_lexicon.js
@@ -37,7 +37,9 @@ var QuickLexicon = Backbone.View.extend({
         '<% if ((item.count != null) && (!showClickWord)) { showClickWord = true; %><span class="strongCount"> (<%= sprintf(__s.stats_occurs_times_in_bible, item.count) %>.)<% } %>' +
         '<% if (brief_morph_info[data_index] != null) { %> ' +
 		',&nbsp;&nbsp;<span><%= brief_morph_info[data_index] %></span> ' +
-        '<% if (view.variant[data_index] !== "") { %> <span>, (Only in <%= view.variant[data_index] %> manuscript)</span> <% } %>' +
+        '<% var currentVariant = view.variant[data_index]; %> ' +
+        '<% if ((typeof currentVariant !== "string") && (typeof view.variant[0] === "string")) currentVariant = view.variant[0]; %> ' +
+        '<% if ((typeof currentVariant === "string") && (currentVariant !== "")) { %> <span>, (in <%= currentVariant %> manuscript)</span> <% } %>' +
         '<% if (showClickWord) { %> - <span class="clickMoreInfo"><%= __s.more_info_on_click_of_word %></span></span> <% } %>' +
         '</div>' +
 		'<% } %>' +

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
@@ -223,8 +223,11 @@ var SidebarView = Backbone.View.extend({
                 if (!step.touchDevice || step.touchWideDevice)
                 	panelContentContainer.append(panelBody);
                 this._createBriefWordPanel(panelBody, item, currentUserLang, allVersions);
-                if (variant[i] !== "")
-                    panelBody.append("<div>Only in " + variant[i] + " manuscript</div>");
+                var currentVariant = variant[i];
+                if ((typeof currentVariant !== "string") && (typeof variant[0] === "string"))
+                    currentVariant = variant[0];
+                if ((typeof currentVariant === "string") && (currentVariant !== ""))
+                    panelBody.append("<div>in " + currentVariant + " manuscript</div>");
                 // need to handle multiple morphInfo (array)
                 if ((lastMorphCode != '') && (data.morphInfos.length == 0)) {
                     data.morphInfos = cf.getTOSMorphologyInfo(lastMorphCode);