From f8ef380b34df1e8c126ddea8d4ab4d5e34f93072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Tue, 22 Sep 2020 20:51:26 -0400 Subject: [PATCH] fix: multiword match highlight --- public/src/client/search.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/src/client/search.js b/public/src/client/search.js index af6e0ff16355..f6e2633aae29 100644 --- a/public/src/client/search.js +++ b/public/src/client/search.js @@ -139,8 +139,10 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo return; } searchQuery = utils.escapeHTML(searchQuery.replace(/^"/, '').replace(/"$/, '').trim()); - var regexStr = searchQuery.split(' ').join('|'); - var regex = new RegExp('(' + utils.escapeRegexChars(regexStr) + ')', 'gi'); + var regexStr = searchQuery.split(' ') + .map(function (word) { return utils.escapeRegexChars(word); }) + .join('|'); + var regex = new RegExp('(' + regexStr + ')', 'gi'); $('.search-result-text p, .search-result-text h4').each(function () { var result = $(this);