From 7554cb057b4e13519744e1fb8e67b7aee23db9e3 Mon Sep 17 00:00:00 2001 From: zadam Date: Mon, 9 Dec 2019 19:38:48 +0100 Subject: [PATCH] support unicode characters in filters without quotes, fixes #757 --- package-lock.json | 2 +- src/public/javascripts/services/utils.js | 2 +- src/services/parse_filters.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index daf4b6d8d..54d3a1f1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.37.7", + "version": "0.37.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/public/javascripts/services/utils.js b/src/public/javascripts/services/utils.js index d6c311f14..3586c5b75 100644 --- a/src/public/javascripts/services/utils.js +++ b/src/public/javascripts/services/utils.js @@ -77,7 +77,7 @@ async function stopWatch(what, func) { } function formatValueWithWhitespace(val) { - return /[^\w_-]/.test(val) ? '"' + val + '"' : val; + return /[^\p{L}_-]/u.test(val) ? '"' + val + '"' : val; } function formatLabel(label) { diff --git a/src/services/parse_filters.js b/src/services/parse_filters.js index ea2a142f4..0625e4b8a 100644 --- a/src/services/parse_filters.js +++ b/src/services/parse_filters.js @@ -1,6 +1,6 @@ const dayjs = require("dayjs"); -const filterRegex = /(\b(AND|OR)\s+)?@(!?)([\w_]+|"[^"]+")\s*((=|!=|<|<=|>|>=|!?\*=|!?=\*|!?\*=\*)\s*([\w_/-]+|"[^"]+"))?/ig; +const filterRegex = /(\b(AND|OR)\s+)?@(!?)([\p{L}_]+|"[^"]+")\s*((=|!=|<|<=|>|>=|!?\*=|!?=\*|!?\*=\*)\s*([\p{L}_/-]+|"[^"]+"))?/igu; const smartValueRegex = /^(NOW|TODAY|WEEK|MONTH|YEAR) *([+\-] *\d+)?$/i; function calculateSmartValue(v) {