show multiple results per section, if present

Author: dojutsu-user

readthedocs/core/static-src/core/js/doc-embed/search.js

@@ -4,6 +4,7 @@
 
 var rtddata = require('./rtd-data');
 var xss = require('xss/lib/index');
+var MAX_RESULT_PER_SECTION = 3;
 
 
 /*
@@ -74,9 +75,11 @@ function attach_elastic_search_query(data) {
                                         <%= section_subtitle %> \
                                     </a> \
                                 </div> \
-                                <span> \
-                                    <%= section_content %> \
-                                </span>';
+                                <% for (var i = 0; i < section_content.length; ++i) { %> \
+                                    <div> \
+                                        <%= section_content[i] %> \
+                                    </div> \
+                                <% } %>';
 
                             var domain_template =
                                 '<div> \
@@ -94,15 +97,19 @@ function attach_elastic_search_query(data) {
                                 var section = inner_hits[j];
                                 var section_subtitle = section._source.title;
                                 var section_subtitle_link = link + "#" + section._source.id;
-                                var section_content = section._source.content.substring(0, 100) + " ...";
+                                var section_content = [ section._source.content.substring(0, 100) + " ..." ];
 
                                 if (section.highlight) {
                                     if (section.highlight["sections.title"]) {
                                         section_subtitle = xss(section.highlight["sections.title"][0]);
                                     }
 
                                     if (section.highlight["sections.content"]) {
-                                        section_content = "... " + xss(section.highlight["sections.content"][0]) +" ...";
+                                        var content = section.highlight["sections.content"];
+                                        section_content = [];
+                                        for (var k = 0; k < content.length && k < MAX_RESULT_PER_SECTION; ++k) {
+                                            section_content.push("... " + xss(content[k]) + " ...");
+                                        }
                                     }
                                 }
 
@@ -128,9 +135,9 @@ function attach_elastic_search_query(data) {
 
                                 if (
                                     typeof domain._source.display_name === "string" &&
-                                    domain._source.display_name.length >= 2  // "2" because some domain display_name are "-"
+                                    domain._source.display_name.length >= 1
                                 ) {
-                                    domain_subtitle = "(" + domain._source.role_name + ")" + domain._source.display_name;
+                                    domain_subtitle = "(" + domain._source.role_name + ") " + domain._source.display_name;
                                 }
 
                                 // preparing domain_content

readthedocs/core/static/core/js/readthedocs-doc-embed.js

@@ -188,8 +188,7 @@ <h3>
                         <p>
                           <a href="{% doc_url result.project|get_project result.version inner_hit.source.doc_name %}#{{ inner_hit.source.anchor }}">
 
-                            {% comment %} ">= 2" because some display_name are just "-" {% endcomment %}
-                            {% if inner_hit.source.display_name|length >= 2 %}
+                            {% if inner_hit.source.display_name|length >= 1 %}
                               ({{ inner_hit.source.role_name }}) {{ inner_hit.source.display_name}}
                             {% else %}
                               {{ inner_hit.source.role_name }}
@@ -218,15 +217,17 @@ <h3>
                             {% endif %}
                           </a>
                         </p>
-                        <p class="fragment">
-                          {% if inner_hit.highlight|get_key_or_none:"sections.content" %}
-                            {% with l=inner_hit.highlight|get_key_or_none:"sections.content" %}
-                              ... {{ l.0|safe }} ...
-                            {% endwith %}
-                          {% else %}
-                            {{ inner_hit.source.content|slice:"100" }} ...
-                          {% endif %}
-                        </p>
+                        {% if inner_hit.highlight|get_key_or_none:"sections.content" %}
+                          {% with section_content=inner_hit.highlight|get_key_or_none:"sections.content" %}
+                            {% for content in section_content %}
+                              <p class="fragment">
+                                ... {{ content|safe }} ...
+                              </p>
+                            {% endfor %}
+                          {% endwith %}
+                        {% else %}
+                          {{ inner_hit.source.content|slice:"100" }} ...
+                        {% endif %}
                       {% endif %}
                     {% endfor %}
                   {% endif %}