Merge d472d02 into 689c45e

adsabs · Jan 29, 2021 · 07d6c4e · 07d6c4e
2 parents 689c45e + d472d02
commit 07d6c4e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/src/config/common.config.js b/src/config/common.config.js
@@ -144,6 +144,9 @@ define([], function() {
     Handlebars.registerHelper('toJSON', function(object) {
       return JSON.stringify(object);
     });
+    Handlebars.registerHelper('isdefined', function(value) {
+      return typeof value !== 'undefined';
+    });
   });
 
   // set validation callbacks used by authentication and user settings widgets

diff --git a/src/js/widgets/list_of_things/templates/item-template.html b/src/js/widgets/list_of_things/templates/item-template.html
@@ -267,20 +267,26 @@ <h3 class="s-results-title">{{{title}}}</h3>
 {{/if}}
 
     <div class="row highlight-row">
-        {{#if showHighlights}}
+    {{#if showHighlights}}
+
         <div class="col-xs-10 col-xs-offset-1 s-more-info">
-                {{#if highlights}}
-                    <h4 class="sr-only">Search Highlights</h4>
-                    <ul aria-label="search snippets" class="s-search-snippets">
-                        {{#each highlights}}
-                        <li>{{{this}}}</li>
-                        {{/each}}
-                    </ul>
-                {{else}}
-                  <span class="text-muted"><i class="fa fa-spinner fa-pulse" aria-hidden="true"></i> Loading Highlights...</span>
-                {{/if}}
-        </div>
+        {{#if (isdefined highlights)}}
+            {{#if highlights.length}}
+            <h4 class="sr-only">Search Highlights</h4>
+            <ul aria-label="search snippets" class="s-search-snippets">
+                {{#each highlights}}
+                <li>{{{this}}}</li>
+                {{/each}}
+            </ul>
+
+            {{else}}
+                <span class="text-muted">No highlights</span>
+            {{/if}}
+        {{else}}
+            <span class="text-muted"><i class="fa fa-spinner fa-pulse" aria-hidden="true"></i> Loading Highlights...</span>
         {{/if}}
+        </div>
+    {{/if}}
     </div>
 
     <div class="row abstract-row">

diff --git a/src/js/widgets/list_of_things/widget.js b/src/js/widgets/list_of_things/widget.js
@@ -268,7 +268,7 @@ define([
         // make sure the new docs close highlights if they aren't there
         var newDocs = _.map(docs, function(d) {
           return _.extend(d, {
-            showHighlights: !_.isEmpty(d.highlights),
+            showHighlights: typeof d.highlights !== 'undefined',
             showCheckbox: !!self.model.get('showCheckboxes'),
           });
         });
@@ -606,7 +606,7 @@ define([
           var q = this.model.get('currentQuery').clone();
           q.set({
             hl: 'true',
-            'hl.fl': 'title,abstract,body,ack',
+            'hl.fl': 'title,abstract,body,ack,*',
             'hl.maxAnalyzedChars': '150000',
             'hl.requireFieldMatch': 'true',
             'hl.usePhraseHighlighter': 'true',

diff --git a/src/js/widgets/results/widget.js b/src/js/widgets/results/widget.js
@@ -327,16 +327,14 @@ define([
               finalList = finalList.concat(pair[1]);
             });
 
-            if (finalList.length === 1 && finalList[0].trim() === '') {
-              return {};
-            }
-
             return {
               highlights: finalList,
             };
           })();
         }
 
+        d.highlights = h.highlights;
+
         var maxAuthorNames = self.minAuthorsPerResult;
         var shownAuthors;
 
@@ -359,10 +357,6 @@ define([
           d.allAuthorFormatted = _.map(d.author, format);
         }
 
-        if (h.highlights && h.highlights.length > 0) {
-          d.highlights = h.highlights;
-        }
-
         d.formattedDate = d.pubdate
           ? self.formatDate(d.pubdate, {
               format: 'yy/mm',