diff options
author | Stefan Malzner <stefan@adlk.io> | 2019-05-24 10:04:03 +0200 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2019-05-24 10:04:03 +0200 |
commit | 5828062915dfa62318f1570351887a750f65e8c1 (patch) | |
tree | 9371d30f3351f5341bada99c258ab037429e56d1 /src | |
parent | Merge pull request #1443 from meetfranz/feature/multilingual-announcements (diff) | |
download | ferdium-app-5828062915dfa62318f1570351887a750f65e8c1.tar.gz ferdium-app-5828062915dfa62318f1570351887a750f65e8c1.tar.zst ferdium-app-5828062915dfa62318f1570351887a750f65e8c1.zip |
feat(App): Bump electron to 5.0.1
Diffstat (limited to 'src')
-rw-r--r-- | src/index.html | 4 | ||||
-rw-r--r-- | src/index.js | 1 | ||||
-rw-r--r-- | src/models/Service.js | 4 |
3 files changed, 6 insertions, 3 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 @@ | |||
17 | if (isDevMode) { | 17 | if (isDevMode) { |
18 | const debugging = require('debug'); | 18 | const debugging = require('debug'); |
19 | debugging.enable(process.env.DEBUG); | 19 | debugging.enable(process.env.DEBUG); |
20 | 20 | ||
21 | const debug = debugging('Index'); | 21 | const debug = debugging('Index'); |
22 | 22 | ||
23 | document.querySelector('body').classList.add('isDevMode'); | 23 | document.querySelector('body').classList.add('isDevMode'); |
@@ -36,7 +36,7 @@ | |||
36 | window._onLiveReloadFileChanged = (file) => { | 36 | window._onLiveReloadFileChanged = (file) => { |
37 | if (!file.path.includes('/build/webview/') && !file.path.includes('/build/index.js') && !file.path.includes('/build/electron/')) { | 37 | if (!file.path.includes('/build/webview/') && !file.path.includes('/build/index.js') && !file.path.includes('/build/electron/')) { |
38 | originalReloadBehaviour(file); | 38 | originalReloadBehaviour(file); |
39 | } else { | 39 | } else { |
40 | if (file.path.includes('/build/webview/')) { | 40 | if (file.path.includes('/build/webview/')) { |
41 | debug('Livereload: Reloading all webvies'); | 41 | debug('Livereload: Reloading all webvies'); |
42 | const webviews = document.querySelectorAll('webview').forEach(webview => webview.reload()); | 42 | 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 = () => { | |||
180 | backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E', | 180 | backgroundColor: !settings.get('darkMode') ? '#3498db' : '#1E1E1E', |
181 | webPreferences: { | 181 | webPreferences: { |
182 | nodeIntegration: true, | 182 | nodeIntegration: true, |
183 | webviewTag: true, | ||
183 | }, | 184 | }, |
184 | }); | 185 | }); |
185 | 186 | ||
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 { | |||
183 | options, | 183 | options, |
184 | })); | 184 | })); |
185 | 185 | ||
186 | this.webview.addEventListener('did-start-loading', () => { | 186 | this.webview.addEventListener('did-start-loading', (event) => { |
187 | debug('Did start load', this.name, event); | ||
188 | |||
187 | this.hasCrashed = false; | 189 | this.hasCrashed = false; |
188 | this.isLoading = true; | 190 | this.isLoading = true; |
189 | this.isError = false; | 191 | this.isError = false; |