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

Merge branch 'master' into m41

Browse Source 
# Conflicts:
#	src/public/javascripts/services/sidebar.js
#	src/public/javascripts/services/tab_context.js
#	src/public/javascripts/services/tree.js
This commit is contained in:
zadam
2020-02-01 20:01:30 +01:00
parent 9f38ea6ee7 7651c53363
commit 513ce1a183
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/widgets/calendar.js
View File

@@ -43,7 +43,7 @@ class CalendarWidget extends StandardWidget {
}
init($el, activeDate) {
this.activeDate = new Date(Date.parse(activeDate));
this.activeDate = new Date(activeDate + "T12:00:00"); // attaching time fixes local timezone handling
this.todaysDate = new Date();
this.date = new Date(this.activeDate.getTime());