Merge pull request #1253 from 0x8b/fix-words-filter

fix words filter
This commit is contained in:
Jack 2021-04-14 23:22:29 +01:00 committed by GitHub
commit 6d992befe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions

View file

@ -649,6 +649,10 @@ export function remove_non_ascii(str) {
return str.replace(/[^\x20-\x7E]/g, "");
}
export function escapeRegExp(str) {
return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
}
export function cleanTypographySymbols(textToClean) {
var specials = {
"“": '"', // “ “

View file

@ -33,12 +33,12 @@ function hide() {
async function filter(language) {
let filterin = $("#wordFilterPopup .wordIncludeInput").val();
filterin = filterin.trim();
filterin = filterin.replace(/ /gi, "|");
filterin = Misc.escapeRegExp(filterin.trim());
filterin = filterin.replace(/\s+/gi, "|");
let regincl = new RegExp(filterin, "i");
let filterout = $("#wordFilterPopup .wordExcludeInput").val();
filterout = filterout.trim();
filterout = filterout.replace(/ /gi, "|");
filterout = Misc.escapeRegExp(filterout.trim());
filterout = filterout.replace(/\s+/gi, "|");
let regexcl = new RegExp(filterout, "i");
let filteredWords = [];
let languageWordList = await Misc.getLanguage(language);