Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Letters between words incorrectly highlighted within post.

This commit is contained in:
Guo Xiang Tan 2019-04-03 15:57:51 +08:00
parent e8a4d72281
commit d1fa2b71cf
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import { PHRASE_MATCH_REGEXP_PATTERN } from "discourse/lib/concerns/search-const
export const CLASS_NAME = "search-highlight"; export const CLASS_NAME = "search-highlight";
export default function($elem, term) { export default function($elem, term, opts = {}) {
if (!_.isEmpty(term)) { if (!_.isEmpty(term)) {
// special case ignore "l" which is used for magic sorting // special case ignore "l" which is used for magic sorting
let words = _.reject( let words = _.reject(
@ -11,6 +11,8 @@ export default function($elem, term) {
); );
words = words.map(w => w.replace(/^"(.*)"$/, "$1")); words = words.map(w => w.replace(/^"(.*)"$/, "$1"));
$elem.highlight(words, { className: CLASS_NAME, wordsOnly: true }); const highlightOpts = { wordsOnly: true };
if (!opts.defaultClassName) highlightOpts.className = CLASS_NAME;
$elem.highlight(words, highlightOpts);
} }
} }

4
app/assets/javascripts/discourse/widgets/post-cooked.js.es6
View File

@ -2,6 +2,7 @@ import { iconHTML } from "discourse-common/lib/icon-library";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import { isValidLink } from "discourse/lib/click-track"; import { isValidLink } from "discourse/lib/click-track";
import { number } from "discourse/lib/formatter"; import { number } from "discourse/lib/formatter";
import highlightText from "discourse/lib/highlight-text";
const _decorators = []; const _decorators = [];
@ -45,7 +46,8 @@ export default class PostCooked {
if (this._highlighted) { if (this._highlighted) {
$html.unhighlight(); $html.unhighlight();
} }
$html.highlight(highlight.split(/\s+/));
highlightText($html, highlight, { defaultClassName: true });
this._highlighted = true; this._highlighted = true;
} else if (this._highlighted) { } else if (this._highlighted) {
$html.unhighlight(); $html.unhighlight();

15
test/javascripts/acceptance/search-test.js.es6
View File

@ -75,15 +75,22 @@ QUnit.test("Search with context", async assert => {
await visit("/t/internationalization-localization/280/1"); await visit("/t/internationalization-localization/280/1");
await click("#search-button"); await click("#search-button");
await fillIn("#search-term", "dev"); await fillIn("#search-term", "a proper");
await click(".search-context input[type='checkbox']"); await click(".search-context input[type='checkbox']");
await keyEvent("#search-term", "keyup", 16); await keyEvent("#search-term", "keyup", 16);
assert.ok(exists(".search-menu .results ul li"), "it shows results"); assert.ok(exists(".search-menu .results ul li"), "it shows results");
assert.ok( const highlighted = [];
exists(".cooked span.highlight-strong"),
"it should highlight the search term" find("#post_7 span.highlight-strong").map((_, span) => {
highlighted.push(span.innerText);
});
assert.deepEqual(
highlighted,
["a", "a", "proper", "a"],
"it should highlight the post with the search terms correctly"
); );
let callbackCalled = false; let callbackCalled = false;

1
vendor/assets/javascripts/highlight.js vendored
View File

@ -106,4 +106,3 @@ jQuery.fn.highlight = function (words, options) {
jQuery.highlight(this, re, settings.element, settings.className); jQuery.highlight(this, re, settings.element, settings.className);
}); });
}; };