gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-04 05:28:59 +01:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

fix note switching in current tab

Browse Source
This commit is contained in:
zadam 2020-01-24 21:15:40 +01:00
parent ba500a3a80
commit 7d9b720ea8
5 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -52,7 +52,6 @@
"ini": "1.3.5",
"jimp": "0.9.3",
"mime-types": "2.1.26",
"moment": "2.24.0",
"multer": "1.4.2",
"node-abi": "2.13.0",
"open": "7.0.0",

14
src/public/javascripts/services/app_context.js
View File

@ -138,15 +138,11 @@ class AppContext {
}
}
activateNote(notePath) {
const activeTabContext = this.getActiveTabContext();
console.log("Setting activeTabContext to " + notePath);
activeTabContext.setNote(notePath);
this._setTitleBar();
this._setCurrentNotePathToHash();
tabNoteSwitchedListener({tabId}) {
if (tabId === this.activeTabId) {
this._setTitleBar();
this._setCurrentNotePathToHash();
}
}
_setCurrentNotePathToHash() {

14
src/public/javascripts/widgets/note_detail.js
View File

@ -95,17 +95,17 @@ export default class NoteDetailWidget extends TabAwareWidget {
}
async initType() {
do {
this.type = this.getWidgetType();
let foundType;
console.log(`Note detail type = ${this.type} for ${this.tabContext.tabId}`);
do {
foundType = this.type = this.getWidgetType();
if (!(this.type in this.typeWidgetPromises)) {
this.typeWidgetPromises[this.type] = this.initWidgetType(this.type);
}
await this.typeWidgetPromises[this.type];
} while (this.type !== this.getWidgetType());
} while (foundType !== this.getWidgetType());
}
setupClasses() {
@ -216,10 +216,4 @@ export default class NoteDetailWidget extends TabAwareWidget {
protectedSessionStartedListener() {
this.refresh();
}
async eventReceived(name, data, sync = false) {
console.log("Received ", name, data);
super.eventReceived(name, data, sync);
}
}

3
src/public/javascripts/widgets/note_tree.js
View File

@ -107,7 +107,8 @@ export default class NoteTreeWidget extends TabAwareWidget {
const notePath = await treeUtils.getNotePath(data.node);
this.appContext.activateNote(notePath);
const activeTabContext = this.appContext.getActiveTabContext();
await activeTabContext.setNote(notePath);
},
expand: (event, data) => this.setExpandedToServer(data.node.data.branchId, true),
collapse: (event, data) => this.setExpandedToServer(data.node.data.branchId, false),

6
src/public/javascripts/widgets/type_widgets/empty.js
View File

@ -36,12 +36,6 @@ export default class EmptyTypeWidget extends TypeWidget {
return this.$widget;
}
toggle(show) {
console.log("EMPTY TOGGLE", show);
super.toggle(show);
}
refresh() {
this.toggle(!this.tabContext.note);
}