Skip to content

Commit 0eedfbb

Browse files
squidfunksquidfunk
committed
Fixed #1755: custom search separator not set
1 parent 02cd4ed commit 0eedfbb

File tree

9 files changed

+18
-16
lines changed

9 files changed

+18
-16
lines changed

‎material/assets/javascripts/bundle.594f2bf6.min.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎material/assets/javascripts/bundle.883417a8.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎material/assets/javascripts/bundle.594f2bf6.min.js.map renamed to ‎material/assets/javascripts/bundle.883417a8.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎material/assets/javascripts/worker/search.c03f0417.min.js renamed to ‎material/assets/javascripts/worker/search.7a2ea5ba.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎material/assets/javascripts/worker/search.7a2ea5ba.min.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎material/assets/javascripts/worker/search.c03f0417.min.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎material/assets/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"assets/javascripts/bundle.js": "assets/javascripts/bundle.594f2bf6.min.js",
3-
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.594f2bf6.min.js.map",
2+
"assets/javascripts/bundle.js": "assets/javascripts/bundle.883417a8.min.js",
3+
"assets/javascripts/bundle.js.map": "assets/javascripts/bundle.883417a8.min.js.map",
44
"assets/javascripts/vendor.js": "assets/javascripts/vendor.de50e36d.min.js",
55
"assets/javascripts/vendor.js.map": "assets/javascripts/vendor.de50e36d.min.js.map",
6-
"assets/javascripts/worker/search.js": "assets/javascripts/worker/search.c03f0417.min.js",
7-
"assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.c03f0417.min.js.map",
6+
"assets/javascripts/worker/search.js": "assets/javascripts/worker/search.7a2ea5ba.min.js",
7+
"assets/javascripts/worker/search.js.map": "assets/javascripts/worker/search.7a2ea5ba.min.js.map",
88
"assets/stylesheets/main.css": "assets/stylesheets/main.b8fb47b5.min.css",
99
"assets/stylesheets/main.css.map": "assets/stylesheets/main.b8fb47b5.min.css.map",
1010
"assets/stylesheets/palette.css": "assets/stylesheets/palette.36d1b78f.min.css",

‎material/base.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ <h1>{{ page.title | default(config.site_name, true)}}</h1>
183183
</div>
184184
{% block scripts %}
185185
<script src="{{ 'assets/javascripts/vendor.de50e36d.min.js' | url }}"></script>
186-
<script src="{{ 'assets/javascripts/bundle.594f2bf6.min.js' | url }}"></script>
186+
<script src="{{ 'assets/javascripts/bundle.883417a8.min.js' | url }}"></script>
187187
{%- set translations = {} -%}
188188
{%- for key in [
189189
"clipboard.copy",
@@ -207,7 +207,7 @@ <h1>{{ page.title | default(config.site_name, true)}}</h1>
207207
base: "{{ base_url }}",
208208
features: {{ config.theme.features | tojson }},
209209
search: Object.assign({
210-
worker: "{{ 'assets/javascripts/worker/search.c03f0417.min.js' | url }}"
210+
worker: "{{ 'assets/javascripts/worker/search.7a2ea5ba.min.js' | url }}"
211211
}, typeof search !== "undefined" && search)
212212
})
213213
</script>

‎src/assets/javascripts/integrations/search/_/index.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,12 @@ export class Search {
133133
this.documents = setupSearchDocumentMap(docs)
134134
this.highlight = setupSearchHighlighter(config)
135135

136+
/* Set separator for tokenizer */
137+
lunr.tokenizer.separator = new RegExp(config.separator)
138+
136139
/* If no index was given, create it */
137140
if (typeof index === "undefined") {
138141
this.index = lunr(function() {
139-
pipeline = pipeline || ["trimmer", "stopWordFilter"]
140142

141143
/* Set up alternate search languages */
142144
if (config.lang.length === 1 && config.lang[0] !== "en") {
@@ -147,12 +149,12 @@ export class Search {
147149

148150
/* Set up pipeline according to configuration */
149151
this.pipeline.reset()
150-
for (const fn of pipeline)
152+
for (const fn of pipeline!)
151153
this.pipeline.add(lunr[fn])
152154

153155
/* Set up search pipeline according to configuration */
154156
this.searchPipeline.reset()
155-
for (const fn of pipeline)
157+
for (const fn of pipeline!)
156158
this.searchPipeline.add(lunr[fn])
157159

158160
/* Set up fields and reference */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy