Merge pull request #330 from meetfranz/developv5.0.0-beta.14

Beta 14

4 files changed, 53 insertions, 21 deletions

diff --git a/src/webview/lib/RecipeWebview.js b/src/webview/lib/RecipeWebview.js
index b8acc1258..048beea69 100644
--- a/src/webview/lib/RecipeWebview.js
+++ b/src/webview/lib/RecipeWebview.js
@@ -66,7 +66,7 @@ class RecipeWebview {
 
   onNotify(fn) {
     if (typeof fn === 'function') {
-      window.Notification.onNotify = fn;
+      window.Notification.prototype.onNotify = fn;
     }
   }
 
diff --git a/src/webview/notifications.js b/src/webview/notifications.js
index 4055b10de..4f602bfdb 100644
--- a/src/webview/notifications.js
+++ b/src/webview/notifications.js
@@ -10,9 +10,9 @@ class Notification {
     this.notificationId = uuidV1();
 
     ipcRenderer.sendToHost('notification', this.onNotify({
+      title: this.title,
+      options: this.options,
       notificationId: this.notificationId,
-      title,
-      options,
     }));
 
     ipcRenderer.once(`notification-onclick:${this.notificationId}`, () => {
diff --git a/src/webview/plugin.js b/src/webview/plugin.js
index ffc9084e4..c877132b1 100644
--- a/src/webview/plugin.js
+++ b/src/webview/plugin.js
@@ -1,11 +1,13 @@
-const { ipcRenderer } = require('electron');
-const path = require('path');
+import { ipcRenderer } from 'electron';
+import path from 'path';
 
-const RecipeWebview = require('./lib/RecipeWebview');
+import RecipeWebview from './lib/RecipeWebview';
 
-require('./notifications.js');
-require('./spellchecker.js');
-require('./ime.js');
+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');
@@ -19,6 +21,20 @@ ipcRenderer.on('initializeRecipe', (e, data) => {
   }
 });
 
+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);
+      // }
+    }
+  }
+});
+
 document.addEventListener('DOMContentLoaded', () => {
   ipcRenderer.sendToHost('hello');
 }, false);
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index ec8807874..5beb77e03 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,14 +1,30 @@
 import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
 
-window.spellCheckHandler = new SpellCheckHandler();
-setTimeout(() => {
-  window.spellCheckHandler.attachToInput();
-}, 1000);
-
-// TODO: should we set the language to user settings?
-// window.spellCheckHandler.switchLanguage('en-US');
-
-const contextMenuBuilder = new ContextMenuBuilder(window.spellCheckHandler);
-const contextMenuListener = new ContextMenuListener((info) => { // eslint-disable-line
-  contextMenuBuilder.showPopupMenu(info);
-});
+import { isMac } from '../environment';
+
+export default class Spellchecker {
+  isEnabled = false;
+  spellchecker = null;
+
+  enable() {
+    this.spellchecker = new SpellCheckHandler();
+    if (!isMac) {
+      this.spellchecker.attachToInput();
+      this.spellchecker.switchLanguage(navigator.language);
+    }
+
+    const contextMenuBuilder = new ContextMenuBuilder(this.spellchecker);
+
+    new ContextMenuListener((info) => { // eslint-disable-line
+      contextMenuBuilder.showPopupMenu(info);
+    });
+  }
+
+  // TODO: this does not work yet, needs more testing
+  // switchLanguage(language) {
+  //   if (language !== 'auto') {
+  //     this.spellchecker.switchLanguage(language);
+  //   }
+  // }
+}
+