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

Merge remote-tracking branch 'origin/develop' into feature/rtl

Browse Source 
; Conflicts:
;	src/public/app/widgets/floating_buttons/help_button.ts
This commit is contained in:
Elian Doran
2025-03-05 21:57:53 +02:00
parent c99c4a4302 f2d1726852
commit 1976fe6729
141 changed files with 2212 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/public/app/services/utils.ts
View File

@@ -36,20 +36,20 @@ function parseDate(str: string) {
// Source: https://stackoverflow.com/a/30465299/4898894
function getMonthsInDateRange(startDate: string, endDate: string) {
const start = startDate.split('-');
const end = endDate.split('-');
const start = startDate.split("-");
const end = endDate.split("-");
const startYear = parseInt(start[0]);
const endYear = parseInt(end[0]);
const dates = [];
for (let i = startYear; i <= endYear; i++) {
const endMonth = i != endYear ? 11 : parseInt(end[1]) - 1;
const startMon = i === startYear ? parseInt(start[1])-1 : 0;
const startMon = i === startYear ? parseInt(start[1]) - 1 : 0;
for(let j = startMon; j <= endMonth; j = j > 12 ? j % 12 || 11 : j+1) {
const month = j+1;
const displayMonth = month < 10 ? '0'+month : month;
dates.push([i, displayMonth].join('-'));
for (let j = startMon; j <= endMonth; j = j > 12 ? j % 12 || 11 : j + 1) {
const month = j + 1;
const displayMonth = month < 10 ? "0" + month : month;
dates.push([i, displayMonth].join("-"));
}
}
return dates;
@@ -164,7 +164,7 @@ function escapeHtml(str: string) {
}
export function escapeQuotes(value: string) {
return value.replaceAll("\"", "&quot;");
return value.replaceAll('"', "&quot;");
}
function formatSize(size: number) {