ref

src/public/javascripts/desktop.js

@@ -66,6 +66,7 @@ import RelationMapTypeWidget from "./widgets/type_widgets/relation_map.js";
 import ProtectedSessionTypeWidget from "./widgets/type_widgets/protected_session.js";
 import BookTypeWidget from "./widgets/type_widgets/book.js";
 import contextMenu from "./services/context_menu.js";
+import DesktopLayout from "./widgets/desktop_layout.js";
 
 if (utils.isElectron()) {
     require('electron').ipcRenderer.on('globalShortcut', async function(event, actionName) {
@@ -79,6 +80,7 @@ $('[data-toggle="tooltip"]').tooltip({
 
 macInit.init();
 
+appContext.setLayout(new DesktopLayout());
 appContext.start();
 
 noteTooltipService.setupGlobalTooltip();

src/public/javascripts/services/app_context.js

@@ -6,18 +6,14 @@ import Entrypoints from "./entrypoints.js";
 import options from "./options.js";
 import utils from "./utils.js";
 import ZoomService from "./zoom.js";
-import Layout from "../widgets/layout.js";
 import TabManager from "./tab_manager.js";
 import treeService from "./tree.js";
 import Component from "../widgets/component.js";
 import keyboardActionsService from "./keyboard_actions.js";
 
 class AppContext extends Component {
-    constructor(layout) {
-        super(null);
-
+    setLayout(layout) {
         this.layout = layout;
-        this.executors = [];
     }
 
     async start() {
@@ -96,9 +92,7 @@ class AppContext extends Component {
     }
 }
 
-const layout = new Layout();
-
-const appContext = new AppContext(layout);
+const appContext = new AppContext();
 
 // we should save all outstanding changes before the page/app is closed
 $(window).on('beforeunload', () => {

src/public/javascripts/widgets/desktop_layout.js

@@ -26,7 +26,7 @@ import SimilarNotesWidget from "./similar_notes.js";
 import WhatLinksHereWidget from "./what_links_here.js";
 import SidePaneToggles from "./side_pane_toggles.js";
 
-export default class Layout {
+export default class DesktopLayout {
     getRootWidget(appContext) {
         return new FlexContainer('column')
             .setParent(appContext)