Merge branch 'chore/electron-5.0.1' into release/5.2.0-beta.1

5 files changed, 21 insertions, 11 deletions

diff --git a/src/index.html b/src/index.html
index 5ce7f6a96..bf15e2d4e 100644
--- a/src/index.html
+++ b/src/index.html
@@ -17,7 +17,7 @@
     if (isDevMode) {
       const debugging = require('debug');
       debugging.enable(process.env.DEBUG);
-      
+
       const debug = debugging('Index');
 
       document.querySelector('body').classList.add('isDevMode');
@@ -36,7 +36,7 @@
           window._onLiveReloadFileChanged = (file) => {
             if (!file.path.includes('/build/webview/') && !file.path.includes('/build/index.js') && !file.path.includes('/build/electron/')) {
               originalReloadBehaviour(file);
-            } else {              
+            } else {
               if (file.path.includes('/build/webview/')) {
                 debug('Livereload: Reloading all webvies');
                 const webviews = document.querySelectorAll('webview').forEach(webview => webview.reload());
diff --git a/src/index.js b/src/index.js
index 3fe996aa7..49cf07618 100644
--- a/src/index.js
+++ b/src/index.js
@@ -180,6 +180,7 @@ const createWindow = () => {
     backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E',
     webPreferences: {
       nodeIntegration: true,
+      webviewTag: true,
     },
   });
 
diff --git a/src/models/Service.js b/src/models/Service.js
index 8a2a8d3d8..a118c093e 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -183,7 +183,9 @@ export default class Service {
       options,
     }));
 
-    this.webview.addEventListener('did-start-loading', () => {
+    this.webview.addEventListener('did-start-loading', (event) => {
+      debug('Did start load', this.name, event);
+
       this.hasCrashed = false;
       this.isLoading = true;
       this.isError = false;
diff --git a/src/webview/contextMenu.js b/src/webview/contextMenu.js
index a4a6ab899..967e8e667 100644
--- a/src/webview/contextMenu.js
+++ b/src/webview/contextMenu.js
@@ -280,12 +280,13 @@ const buildMenuTpl = (props, suggestions, isSpellcheckEnabled, defaultSpellcheck
 };
 
 export default function contextMenu(spellcheckProvider, isSpellcheckEnabled, getDefaultSpellcheckerLanguage, getSpellcheckerLanguage) {
-  webContents.on('context-menu', (e, props) => {
+  webContents.on('context-menu', async (e, props) => {
     e.preventDefault();
 
     let suggestions = [];
     if (spellcheckProvider && props.misspelledWord) {
-      suggestions = spellcheckProvider.getSuggestion(props.misspelledWord);
+      debug('Mispelled word', props.misspelledWord);
+      suggestions = await spellcheckProvider.getSuggestion(props.misspelledWord);
 
       debug('Suggestions', suggestions);
     }
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 9158b3b94..64575753f 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,6 +1,8 @@
 import { webFrame } from 'electron';
-import { SpellCheckerProvider } from 'electron-hunspell';
+import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
+import { ENVIRONMENT } from 'hunspell-asm';
 import path from 'path';
+import { readFileSync } from 'fs';
 
 import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
@@ -10,11 +12,12 @@ const debug = require('debug')('Franz:spellchecker');
 let provider;
 let currentDict;
 let _isEnabled = false;
+let attached;
 
 async function loadDictionary(locale) {
   try {
     const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-    await provider.loadDictionary(locale, `${fileLocation}.dic`, `${fileLocation}.aff`);
+    await provider.loadDictionary(locale, readFileSync(`${fileLocation}.dic`), readFileSync(`${fileLocation}.aff`));
     debug('Loaded dictionary', locale, 'from', fileLocation);
   } catch (err) {
     console.error('Could not load dictionary', err);
@@ -41,7 +44,7 @@ export async function switchDict(locale) {
       provider.unloadDictionary(locale);
     }
     loadDictionary(locale);
-    provider.switchDictionary(locale);
+    attached.switchLanguage(locale);
 
     debug('Switched dictionary to', locale);
 
@@ -58,12 +61,15 @@ export default async function initialize(languageCode = 'en-us') {
     const locale = languageCode.toLowerCase();
 
     debug('Init spellchecker');
-    await provider.initialize();
-    // await loadDictionaries();
+    await provider.initialize({ environment: ENVIRONMENT.NODE });
+
+    debug('Attaching spellcheck provider');
+    attached = await attachSpellCheckProvider(provider);
 
     debug('Available spellchecker dictionaries', provider.availableDictionaries);
 
-    switchDict(locale);
+    attached.switchLanguage(locale);
+    console.log('seas oida', attached, provider);
 
     return provider;
   } catch (err) {