Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 11:56:01 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into next60

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
zadam
2023-04-10 18:52:30 +02:00
parent 5d6d9ab6d6 5e88e24693
commit 15a11daf38
62 changed files with 2281 additions and 369 deletions
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!
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
return formatDateISO(date);
@@ -45,7 +45,7 @@ function formatDateTime(date) {
}
function localNowDateTime() {
return dayjs().format('YYYY-MM-DD HH:mm:ss.SSSZZ')
return dayjs().format('YYYY-MM-DD HH:mm:ss.SSSZZ');
}
function now() {
@@ -101,7 +101,7 @@ async function stopWatch(what, func) {
}
function formatValueWithWhitespace(val) {
return /[^\w_-]/.test(val) ? `"${val}"` : val;
return /[^\w-]/.test(val) ? `"${val}"` : val;
}
function formatLabel(label) {
@@ -329,7 +329,7 @@ function initHelpDropdown($el) {
initHelpButtons($dropdownMenu);
}
const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/"
const wikiBaseUrl = "https://github.com/zadam/trilium/wiki/";
function openHelp(e) {
window.open(wikiBaseUrl + $(e.target).attr("data-help-page"), '_blank');
@@ -340,7 +340,7 @@ function initHelpButtons($el) {
// so we do it manually
$el.on("click", e => {
if ($(e.target).attr("data-help-page")) {
openHelp(e)
openHelp(e);
}
});
}