From c5b44c0259387030f9e3d31ae1db8903a95b6b67 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 11 Dec 2017 12:25:49 +0100
Subject: always initialize ContextMenuBuilder but not spellchecker

---
 src/webview/spellchecker.js | 48 ++++++++++++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 18 deletions(-)

(limited to 'src/webview/spellchecker.js')

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;
+    }
+  }
 }
 
-- 
cgit v1.2.3-70-g09d2


From fc49f232d9ac116f2a3bd7667fdd3e553df7516f Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Wed, 13 Dec 2017 11:20:13 +0100
Subject: override spellchecker attribute on inputs to enable/disable
 spellchecker

---
 src/webview/plugin.js       | 15 +++++----------
 src/webview/spellchecker.js | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

(limited to 'src/webview/spellchecker.js')

diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index 610dffc8e..cf38169d3 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -21,23 +21,18 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
   }
 });
 
-let contextMenuBuilder = new ContextMenuBuilder(null, null, isDevMode);
 const spellchecker = new Spellchecker();
+spellchecker.initialize();
+
+const contextMenuBuilder = new ContextMenuBuilder(spellchecker.handler, null, isDevMode);
 
 new ContextMenuListener((info) => { // eslint-disable-line
   contextMenuBuilder.showPopupMenu(info);
 });
 
 ipcRenderer.on('settings-update', (e, data) => {
-  if (data.enableSpellchecking && !spellchecker.isInitialized) {
-    spellchecker.initialize();
-
-    contextMenuBuilder = new ContextMenuBuilder(spellchecker.handler, null, isDevMode);
-
-    new ContextMenuListener((info) => { // eslint-disable-line
-      contextMenuBuilder.showPopupMenu(info);
-    });
-  }
+  console.log('settings-update', data);
+  spellchecker.toggleSpellchecker(data.enableSpellchecking);
 });
 
 // initSpellche
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 5704779d7..a504a4039 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -6,6 +6,11 @@ export default class Spellchecker {
   isInitialized = false;
   handler = null;
   initRetries = 0;
+  DOMCheckInterval = null;
+
+  get inputs() {
+    return document.querySelectorAll('input[type="text"], [contenteditable="true"], textarea');
+  }
 
   initialize() {
     this.handler = new SpellCheckHandler();
@@ -38,5 +43,21 @@ export default class Spellchecker {
       this.isInitialized = true;
     }
   }
+
+  toggleSpellchecker(enable = false) {
+    this.inputs.forEach((input) => {
+      input.setAttribute('spellcheck', enable);
+    });
+
+    this.intervalHandler(enable);
+  }
+
+  intervalHandler(enable) {
+    clearInterval(this.DOMCheckInterval);
+
+    if (enable) {
+      this.DOMCheckInterval = setInterval(() => this.toggleSpellchecker(enable), 30000);
+    }
+  }
 }
 
-- 
cgit v1.2.3-70-g09d2