diff options
author | Vijay Aravamudhan <vraravam@users.noreply.github.com> | 2021-10-04 23:22:35 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-04 23:22:35 +0530 |
commit | e59ef69833aad04b37d77b4428de738fdf098568 (patch) | |
tree | aa6cc0894701e44d965b292ff1c9274ceef46add /src/components | |
parent | 5.6.3-nightly.22 [skip ci] (diff) | |
download | ferdium-app-e59ef69833aad04b37d77b4428de738fdf098568.tar.gz ferdium-app-e59ef69833aad04b37d77b4428de738fdf098568.tar.zst ferdium-app-e59ef69833aad04b37d77b4428de738fdf098568.zip |
chore: upgraded electron to 14.1.0 (#1860)
* upgrade 'electron-react-titlebar' to 1.0.0
* fix issue with 'contextIsolation' and 'enabelRemoteModule' for service-webview
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/auth/AuthLayout.js | 2 | ||||
-rw-r--r-- | src/components/layout/AppLayout.js | 2 | ||||
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 3e2b75731..17ac221a2 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js | |||
@@ -1,7 +1,7 @@ | |||
1 | import React, { Component } from 'react'; | 1 | import React, { Component } from 'react'; |
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer } from 'mobx-react'; | 3 | import { observer } from 'mobx-react'; |
4 | import { TitleBar } from 'electron-react-titlebar'; | 4 | import { TitleBar } from 'electron-react-titlebar/renderer'; |
5 | 5 | ||
6 | import { injectIntl } from 'react-intl'; | 6 | import { injectIntl } from 'react-intl'; |
7 | import Link from '../ui/Link'; | 7 | import Link from '../ui/Link'; |
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 9f8e217b9..0a65dcffa 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -2,7 +2,7 @@ import React, { Component } from 'react'; | |||
2 | import PropTypes from 'prop-types'; | 2 | import PropTypes from 'prop-types'; |
3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; | 3 | import { observer, PropTypes as MobxPropTypes } from 'mobx-react'; |
4 | import { defineMessages, injectIntl } from 'react-intl'; | 4 | import { defineMessages, injectIntl } from 'react-intl'; |
5 | import { TitleBar } from 'electron-react-titlebar'; | 5 | import { TitleBar } from 'electron-react-titlebar/renderer'; |
6 | import injectSheet from 'react-jss'; | 6 | import injectSheet from 'react-jss'; |
7 | 7 | ||
8 | import InfoBar from '../ui/InfoBar'; | 8 | import InfoBar from '../ui/InfoBar'; |
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index c0f48793a..d3170be53 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -85,7 +85,8 @@ class ServiceWebview extends Component { | |||
85 | useragent={service.userAgent} | 85 | useragent={service.userAgent} |
86 | disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined} | 86 | disablewebsecurity={service.recipe.disablewebsecurity ? true : undefined} |
87 | allowpopups | 87 | allowpopups |
88 | webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}`} | 88 | nodeintegration |
89 | webpreferences={`spellcheck=${isSpellcheckerEnabled ? 1 : 0}, contextIsolation=1, enableRemoteModule=1`} | ||
89 | /> | 90 | /> |
90 | ); | 91 | ); |
91 | } | 92 | } |