always initialize ContextMenuBuilder but not spellchecker

2 files changed, 49 insertions, 30 deletions

diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index c877132b1..610dffc8e 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -1,14 +1,14 @@
 import { ipcRenderer } from 'electron';
+import { ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
 import path from 'path';
 
+import { isDevMode } from '../environment';
 import RecipeWebview from './lib/RecipeWebview';
 
 import Spellchecker from './spellchecker.js';
 import './notifications.js';
 import './ime.js';
 
-const spellchecker = new Spellchecker();
-
 ipcRenderer.on('initializeRecipe', (e, data) => {
   const modulePath = path.join(data.recipe.path, 'webview.js');
   // Delete module from cache
@@ -21,20 +21,27 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
   }
 });
 
+let contextMenuBuilder = new ContextMenuBuilder(null, null, isDevMode);
+const spellchecker = new Spellchecker();
+
+new ContextMenuListener((info) => { // eslint-disable-line
+  contextMenuBuilder.showPopupMenu(info);
+});
+
 ipcRenderer.on('settings-update', (e, data) => {
-  if (data.enableSpellchecking) {
-    if (!spellchecker.isEnabled) {
-      spellchecker.enable();
-
-      // TODO: this does not work yet, needs more testing
-      // if (data.spellcheckingLanguage !== 'auto') {
-      //   console.log('set spellchecking language to', data.spellcheckingLanguage);
-      //   spellchecker.switchLanguage(data.spellcheckingLanguage);
-      // }
-    }
+  if (data.enableSpellchecking && !spellchecker.isInitialized) {
+    spellchecker.initialize();
+
+    contextMenuBuilder = new ContextMenuBuilder(spellchecker.handler, null, isDevMode);
+
+    new ContextMenuListener((info) => { // eslint-disable-line
+      contextMenuBuilder.showPopupMenu(info);
+    });
   }
 });
 
+// initSpellche
+
 document.addEventListener('DOMContentLoaded', () => {
   ipcRenderer.sendToHost('hello');
 }, false);
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 5beb77e03..5704779d7 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,30 +1,42 @@
-import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
+import { SpellCheckHandler } from 'electron-spellchecker';
 
 import { isMac } from '../environment';
 
 export default class Spellchecker {
-  isEnabled = false;
-  spellchecker = null;
+  isInitialized = false;
+  handler = null;
+  initRetries = 0;
+
+  initialize() {
+    this.handler = new SpellCheckHandler();
 
-  enable() {
-    this.spellchecker = new SpellCheckHandler();
     if (!isMac) {
-      this.spellchecker.attachToInput();
-      this.spellchecker.switchLanguage(navigator.language);
+      this.attach();
+    } else {
+      this.isInitialized = true;
     }
+  }
 
-    const contextMenuBuilder = new ContextMenuBuilder(this.spellchecker);
+  attach() {
+    let initFailed = false;
 
-    new ContextMenuListener((info) => { // eslint-disable-line
-      contextMenuBuilder.showPopupMenu(info);
-    });
-  }
+    if (this.initRetries > 3) {
+      console.error('Could not initialize spellchecker');
+      return;
+    }
 
-  // TODO: this does not work yet, needs more testing
-  // switchLanguage(language) {
-  //   if (language !== 'auto') {
-  //     this.spellchecker.switchLanguage(language);
-  //   }
-  // }
+    try {
+      this.handler.attachToInput();
+      this.handler.switchLanguage(navigator.language);
+    } catch (err) {
+      initFailed = true;
+      this.initRetries = +1;
+      setTimeout(() => { this.attach(); console.warn('Spellchecker init failed, trying again in 5s'); }, 5000);
+    }
+
+    if (!initFailed) {
+      this.isInitialized = true;
+    }
+  }
 }