diff options
| author |  Kristóf Marussy <kristof@marussy.com> | 2021-04-29 12:49:10 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-04-29 10:49:10 +0000 |
| commit | d433ac994f4a25cbac913ea8528029c33af06da1 (patch) | |
| tree | 6b2e08173da3113fc46ede79c2009d0bb3b457dd /src | |
| parent | docs: add kris7t as a contributor (#1318) (diff) | |
| download | ferdium-app-d433ac994f4a25cbac913ea8528029c33af06da1.tar.gz ferdium-app-d433ac994f4a25cbac913ea8528029c33af06da1.tar.zst ferdium-app-d433ac994f4a25cbac913ea8528029c33af06da1.zip | |
Electron 12 and nodejs 14 support (#1308)
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/services/content/ServiceWebview.js | 2 | ||||
| -rw-r--r-- | src/index.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index 4edbde5e2..9e5fed996 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
| @@ -83,7 +83,7 @@ class ServiceWebview extends Component { | |||
| 83 | useragent={service.userAgent} | 83 | useragent={service.userAgent} |
| 84 | disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined} | 84 | disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined} |
| 85 | allowpopups | 85 | allowpopups |
| 86 | webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}`} | 86 | webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=false`} |
| 87 | /> | 87 | /> |
| 88 | ); | 88 | ); |
| 89 | } | 89 | } |
diff --git a/src/index.js b/src/index.js index 6ad1d44e3..b29cec831 100644 --- a/src/index.js +++ b/src/index.js | |||
| @@ -206,6 +206,7 @@ const createWindow = () => { | |||
| 206 | backgroundColor, | 206 | backgroundColor, |
| 207 | webPreferences: { | 207 | webPreferences: { |
| 208 | nodeIntegration: true, | 208 | nodeIntegration: true, |
| 209 | contextIsolation: false, | ||
| 209 | webviewTag: true, | 210 | webviewTag: true, |
| 210 | preload: path.join(__dirname, 'sentry.js'), | 211 | preload: path.join(__dirname, 'sentry.js'), |
| 211 | enableRemoteModule: true, | 212 | enableRemoteModule: true, |