gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix:Remove duplicates in character class

Browse Source
This commit is contained in:
soulsands 2023-04-08 21:07:48 +08:00
parent 181ddce887
commit a0ac603260
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/public/app/services/utils.js
View File

@ -29,7 +29,7 @@ function formatTimeWithSeconds(date) {
// this is producing local time! // this is producing local time!
function formatDate(date) { function formatDate(date) {
// return padNum(date.getDate()) + ". " + padNum(date.getMonth() + 1) + ". " + date.getFullYear(); // return padNum(date.getDate()) + ". " + padNum(date.getMonth() + 1) + ". " + date.getFullYear();
// instead of european format we'll just use ISO as that's pretty unambiguous // instead of european format we'll just use ISO as that's pretty unambiguous
return formatDateISO(date); return formatDateISO(date);
@ -45,7 +45,7 @@ function formatDateTime(date) {
} }
function localNowDateTime() { function localNowDateTime() {
return dayjs().format('YYYY-MM-DD HH:mm:ss.SSSZZ') return dayjs().format('YYYY-MM-DD HH:mm:ss.SSSZZ');
} }
function now() { function now() {
@ -101,7 +101,7 @@ async function stopWatch(what, func) {
} }
function formatValueWithWhitespace(val) { function formatValueWithWhitespace(val) {
return /[^\w_-]/.test(val) ? `"${val}"` : val; return /[^\w-]/.test(val) ? `"${val}"` : val;
} }
function formatLabel(label) { function formatLabel(label) {
@ -318,7 +318,7 @@ function initHelpDropdown($el) {
initHelpButtons($dropdownMenu); initHelpButtons($dropdownMenu);
} }
const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/" const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/";
function openHelp(e) { function openHelp(e) {
window.open(wikiBaseUrl + $(e.target).attr("data-help-page"), '_blank'); window.open(wikiBaseUrl + $(e.target).attr("data-help-page"), '_blank');
@ -329,7 +329,7 @@ function initHelpButtons($el) {
// so we do it manually // so we do it manually
$el.on("click", e => { $el.on("click", e => {
if ($(e.target).attr("data-help-page")) { if ($(e.target).attr("data-help-page")) {
openHelp(e) openHelp(e);
} }
}); });
} }

6
src/services/attribute_formatter.js
View File

@ -1,4 +1,4 @@
"use strict" "use strict";
function formatAttrForSearch(attr, searchWithValue) { function formatAttrForSearch(attr, searchWithValue) {
let searchStr = ''; let searchStr = '';
@ -28,7 +28,7 @@ function formatAttrForSearch(attr, searchWithValue) {
} }
function formatValue(val) { function formatValue(val) {
if (!/[^\w_]/.test(val)) { if (!/[^\w]/.test(val)) {
return val; return val;
} }
else if (!val.includes('"')) { else if (!val.includes('"')) {
@ -47,4 +47,4 @@ function formatValue(val) {
module.exports = { module.exports = {
formatAttrForSearch formatAttrForSearch
} };

6
src/services/search/services/search.js
View File

@ -73,7 +73,7 @@ function searchFromRelation(note, relationName) {
return []; return [];
} }
const result = scriptService.executeNote(scriptNote, { originEntity: note }); const result = scriptService.executeNote(scriptNote, {originEntity: note});
if (!Array.isArray(result)) { if (!Array.isArray(result)) {
log.info(`Result from ${scriptNote.noteId} is not an array.`); log.info(`Result from ${scriptNote.noteId} is not an array.`);
@ -288,7 +288,7 @@ function searchNotesForAutocomplete(query) {
noteTitle: beccaService.getNoteTitle(result.noteId), noteTitle: beccaService.getNoteTitle(result.noteId),
notePathTitle: result.notePathTitle, notePathTitle: result.notePathTitle,
highlightedNotePathTitle: result.highlightedNotePathTitle highlightedNotePathTitle: result.highlightedNotePathTitle
} };
}); });
} }
@ -370,7 +370,7 @@ function formatAttribute(attr) {
let label = `#${utils.escapeHtml(attr.name)}`; let label = `#${utils.escapeHtml(attr.name)}`;
if (attr.value) { if (attr.value) {
const val = /[^\w_-]/.test(attr.value) ? `"${attr.value}"` : attr.value; const val = /[^\w-]/.test(attr.value) ? `"${attr.value}"` : attr.value;
label += `=${utils.escapeHtml(val)}`; label += `=${utils.escapeHtml(val)}`;
} }