IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Post blurb incorrect when search contains a phrase match.

Browse Source 
If the blurb generated is not around the search term, we will not be
able to highlight it on the client side.
This commit is contained in:
Guo Xiang Tan
2019-03-26 17:01:19 +08:00
parent 1799820256
commit dae0bb4c67
5 changed files with 48 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/lib/concerns/search-constants.js.es6.erb Normal file
View File

@@ -0,0 +1 @@
export const PHRASE_MATCH_REGEXP_PATTERN = '<%= Search::PHRASE_MATCH_REGEXP_PATTERN %>';

8
app/assets/javascripts/discourse/lib/highlight-text.js.es6
View File

@@ -1,7 +1,13 @@
import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-constants";
export default function($elem, term) {
if (!_.isEmpty(term)) {
// special case ignore "l" which is used for magic sorting
let words = _.reject(term.match(/"[^"]+"|[^\s]+/g), t => t === "l");
let words = _.reject(
term.match(new RegExp(`${PHRASE_MATCH_REGEXP_PATTERN}|[^\s]+`, "g")),
t => t === "l"
);
words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
$elem.highlight(words, { className: "search-highlight", wordsOnly: true });
}