From 5828062915dfa62318f1570351887a750f65e8c1 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 24 May 2019 10:04:03 +0200 Subject: feat(App): Bump electron to 5.0.1 --- src/index.html | 4 ++-- src/index.js | 1 + src/models/Service.js | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') 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; -- cgit v1.2.3-70-g09d2