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 Packages Projects Releases Wiki Activity

fixed calendar widget when open in a non-date note

Browse Source
This commit is contained in:
zadam 2021-07-05 15:50:21 +02:00
parent e2819109e9
commit 9adf4d7e8e
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/public/app/services/tab_manager.js
View File

@ -313,10 +313,10 @@ export default class TabManager extends Component {
const idx = this.mainNoteContexts.findIndex(nc => nc.ntxId === noteContextToRemove.ntxId); const idx = this.mainNoteContexts.findIndex(nc => nc.ntxId === noteContextToRemove.ntxId);
if (idx === this.mainNoteContexts.length - 1) { if (idx === this.mainNoteContexts.length - 1) {
this.activatePreviousTabCommand(); await this.activatePreviousTabCommand();
} }
else { else {
this.activateNextTabCommand(); await this.activateNextTabCommand();
} }
} }
@ -356,22 +356,22 @@ export default class TabManager extends Component {
this.tabsUpdate.scheduleUpdate(); this.tabsUpdate.scheduleUpdate();
} }
activateNextTabCommand() { async activateNextTabCommand() {
const oldIdx = this.mainNoteContexts.findIndex(nc => nc.ntxId === this.activeNtxId); const oldIdx = this.mainNoteContexts.findIndex(nc => nc.ntxId === this.activeNtxId);
const newActiveTabId = this.mainNoteContexts[oldIdx === this.noteContexts.length - 1 ? 0 : oldIdx + 1].ntxId; const newActiveTabId = this.mainNoteContexts[oldIdx === this.noteContexts.length - 1 ? 0 : oldIdx + 1].ntxId;
this.activateNoteContext(newActiveTabId); await this.activateNoteContext(newActiveTabId);
} }
activatePreviousTabCommand() { async activatePreviousTabCommand() {
const oldIdx = this.mainNoteContexts.findIndex(nc => nc.ntxId === this.activeNtxId); const oldIdx = this.mainNoteContexts.findIndex(nc => nc.ntxId === this.activeNtxId);
const newActiveTabId = this.mainNoteContexts[oldIdx === 0 ? this.noteContexts.length - 1 : oldIdx - 1].ntxId; const newActiveTabId = this.mainNoteContexts[oldIdx === 0 ? this.noteContexts.length - 1 : oldIdx - 1].ntxId;
this.activateNoteContext(newActiveTabId); await this.activateNoteContext(newActiveTabId);
} }
closeActiveTabCommand() { async closeActiveTabCommand() {
this.removeNoteContext(this.activeNtxId); await this.removeNoteContext(this.activeNtxId);
} }
beforeUnloadEvent() { beforeUnloadEvent() {

9
src/public/app/widgets/buttons/calendar_menu.js
View File

@ -86,9 +86,10 @@ export default class CalendarMenuWidget extends BasicWidget {
} }
init($el, activeDate) { init($el, activeDate) {
this.activeDate = new Date(activeDate + "T12:00:00"); // attaching time fixes local timezone handling // attaching time fixes local timezone handling
this.activeDate = activeDate ? new Date(activeDate + "T12:00:00") : null;
this.todaysDate = new Date(); this.todaysDate = new Date();
this.date = new Date(this.activeDate.getTime()); this.date = new Date((this.activeDate || this.todaysDate).getTime());
this.date.setDate(1); this.date.setDate(1);
this.createMonth(); this.createMonth();
@ -129,6 +130,10 @@ export default class CalendarMenuWidget extends BasicWidget {
} }
isEqual(a, b) { isEqual(a, b) {
if (!a && b || a && !b) {
return false;
}
return a.getFullYear() === b.getFullYear() return a.getFullYear() === b.getFullYear()
&& a.getMonth() === b.getMonth() && a.getMonth() === b.getMonth()
&& a.getDate() === b.getDate(); && a.getDate() === b.getDate();