From f64b343d8db088ec8f710072e0ed483d45151475 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 1 Mar 2020 10:41:23 +0100
Subject: [PATCH] ref

---
 libraries/codemirror/addon/lint/eslint.js              |  6 +++++-
 src/public/javascripts/desktop.js                      |  2 ++
 src/public/javascripts/services/app_context.js         | 10 ++--------
 .../widgets/{layout.js => desktop_layout.js}           |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename src/public/javascripts/widgets/{layout.js => desktop_layout.js} (98%)

diff --git a/libraries/codemirror/addon/lint/eslint.js b/libraries/codemirror/addon/lint/eslint.js
index b5d987e6b..5c310fa63 100644
--- a/libraries/codemirror/addon/lint/eslint.js
+++ b/libraries/codemirror/addon/lint/eslint.js
@@ -46,10 +46,11 @@
         const errors = new eslint().verify(text, {
             root: true,
             parserOptions: {
-                ecmaVersion: 2017
+                ecmaVersion: 2019
             },
             extends: ['eslint:recommended', 'airbnb-base'],
             env: {
+                'browser': true,
                 'node': true
             },
             rules: {
@@ -62,6 +63,9 @@
                 'no-unused-vars': ['warn', { vars: 'local', args: 'after-used' }],
                 'no-nested-ternary': 'off',
                 'no-underscore-dangle': ['error', {'allow': ['_super', '_lookupFactory']}]
+            },
+            globals: {
+                "api": "readonly"
             }
         });
 
diff --git a/src/public/javascripts/desktop.js b/src/public/javascripts/desktop.js
index dcd28744d..a9895230e 100644
--- a/src/public/javascripts/desktop.js
+++ b/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();
diff --git a/src/public/javascripts/services/app_context.js b/src/public/javascripts/services/app_context.js
index f759a60f4..9efe410fd 100644
--- a/src/public/javascripts/services/app_context.js
+++ b/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', () => {
diff --git a/src/public/javascripts/widgets/layout.js b/src/public/javascripts/widgets/desktop_layout.js
similarity index 98%
rename from src/public/javascripts/widgets/layout.js
rename to src/public/javascripts/widgets/desktop_layout.js
index 7f6439c3b..278160103 100644
--- a/src/public/javascripts/widgets/layout.js
+++ b/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)