gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 09:58:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix lazy initialization of the sidebar

Browse Source
This commit is contained in:
zadam 2020-02-06 20:04:43 +01:00
parent d1bb62c40e
commit 8d49249ed7
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -3782,9 +3782,9 @@
} }
}, },
"file-type": { "file-type": {
"version": "14.1.0", "version": "14.1.1",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-14.1.0.tgz", "resolved": "https://registry.npmjs.org/file-type/-/file-type-14.1.1.tgz",
"integrity": "sha512-HfxnzrPH+LLClSAsno88/0frRtamu1XfqEP4IP/8RqBmqQnBQkemv3Udde0t53wZmrdOtc70aaR9WUHyQhjCUQ==", "integrity": "sha512-fGmNwmRgDi3uMDNbJfRRKaOUGN/uzeWRl2Ti9RJdvLpzFMKbl5cBGP3ngHYKiBSbHPB8wzMckP9x9SixJDFftg==",
"requires": { "requires": {
"readable-web-to-node-stream": "^2.0.0", "readable-web-to-node-stream": "^2.0.0",
"strtok3": "^6.0.0", "strtok3": "^6.0.0",

2
package.json
View File

@ -37,7 +37,7 @@
"electron-window-state": "5.0.3", "electron-window-state": "5.0.3",
"express": "4.17.1", "express": "4.17.1",
"express-session": "1.17.0", "express-session": "1.17.0",
"file-type": "14.1.0", "file-type": "14.1.1",
"fs-extra": "8.1.0", "fs-extra": "8.1.0",
"helmet": "3.21.2", "helmet": "3.21.2",
"html": "1.0.0", "html": "1.0.0",

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

@ -34,7 +34,7 @@ import utils from "./utils.js";
import treeService from "./tree.js"; import treeService from "./tree.js";
import SidePaneContainer from "../widgets/side_pane_container.js"; import SidePaneContainer from "../widgets/side_pane_container.js";
import ZoomService from "./zoom.js"; import ZoomService from "./zoom.js";
import SidepaneToggles from "../widgets/sidebar_toggle.js"; import SidePaneToggles from "../widgets/side_pane_toggles.js";
class AppContext { class AppContext {
constructor() { constructor() {
@ -188,9 +188,9 @@ class AppContext {
$centerPane.after(rightPaneContainer.render()); $centerPane.after(rightPaneContainer.render());
const sidebarToggleWidget = new SidepaneToggles(this); const sidePaneTogglesWidget = new SidePaneToggles(this);
$centerPane.after(sidebarToggleWidget.render()); $centerPane.after(sidePaneTogglesWidget.render());
this.components = [ this.components = [
new Entrypoints(), new Entrypoints(),
@ -199,7 +199,7 @@ class AppContext {
leftPaneContainer, leftPaneContainer,
...centerPaneWidgets, ...centerPaneWidgets,
rightPaneContainer, rightPaneContainer,
sidebarToggleWidget sidePaneTogglesWidget
]; ];
if (utils.isElectron()) { if (utils.isElectron()) {

2
src/public/javascripts/widgets/sidebar_toggle.js → src/public/javascripts/widgets/side_pane_toggles.js
View File

@ -28,7 +28,7 @@ const TPL = `
</div> </div>
`; `;
export default class SidepaneToggles extends BasicWidget { export default class SidePaneToggles extends BasicWidget {
constructor(appContext) { constructor(appContext) {
super(appContext); super(appContext);

4
src/public/javascripts/widgets/tab_aware_widget.js
View File

@ -78,6 +78,10 @@ export default class TabAwareWidget extends BasicWidget {
} }
lazyLoadedListener() { lazyLoadedListener() {
if (!this.tabContext) { // has not been loaded yet
this.tabContext = this.appContext.getActiveTabContext();
}
this.refresh(); this.refresh();
} }
} }