PLT-1626/PLT-1424/PLT-1473/PLT-1483 Improved search highlighting (#3171)

* PLT-1626 Stopped breaking up hyphenated hashtags when highlighting search terms

* Made hashtag search highlighting case independent

* PLT-1424 Improved search highlighting when searching for CJK characters

* PLT-1473 Added search term highlighting to single-line code blocks

* PLT-1473 Added search term highlighting to code blocks that don't use syntax highlighting

* PLT-1483 Added proper highlighting of at mentions

* Fixing formatting
Этот коммит содержится в:
Harrison Healey
2016-05-31 10:37:59 -04:00
родитель 397e0a3f68
Коммит 4a326dd6ce
3 изменённых файлов: 54 добавлений и 15 удалений

Просмотреть файл

@@ -123,10 +123,12 @@ hlJS.registerLanguage('yaml', hljsYaml);
const HighlightedLanguages = Constants.HighlightedLanguages;
export function formatCode(lang, data, filename) {
export function formatCode(lang, data, filename, searchTerm) {
const language = lang.toLowerCase() || '';
let contents;
let header = '';
let className = 'post-code';
if (HighlightedLanguages[language]) {
let name = HighlightedLanguages[language].name;
@@ -147,10 +149,13 @@ export function formatCode(lang, data, filename) {
contents = TextFormatting.sanitizeHtml(data);
}
let className = 'post-code';
if (!language) {
// wrap when no language is specified
className += ' post-code--wrap';
const tokens = new Map();
contents = TextFormatting.highlightSearchTerms(contents, tokens, searchTerm);
contents = TextFormatting.replaceTokens(contents, tokens);
}
if (filename) {