diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-02 13:57:24 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-02 13:57:24 +0200 |
commit | 53c16e91b58d0abe3cde88acd05fddbdfc3c683c (patch) | |
tree | 6b3394aabdedc070f6b9e179457627b435b69ad9 /src/components/services/content | |
parent | Fix Ferdi Lock not corrently locking (diff) | |
parent | fix(Spell check): Fix spell checker to initialize without loaded dictionary (diff) | |
download | ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.tar.gz ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.tar.zst ferdium-app-53c16e91b58d0abe3cde88acd05fddbdfc3c683c.zip |
Merge branch 'release/5.4.0' of https://github.com/meetfranz/franz into franz-5.4.0
Diffstat (limited to 'src/components/services/content')
-rw-r--r-- | src/components/services/content/ServiceView.js | 34 | ||||
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 1 |
2 files changed, 25 insertions, 10 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index c45acc961..74d8af0bc 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -13,6 +13,7 @@ import WebviewErrorHandler from './ErrorHandlers/WebviewErrorHandler'; | |||
13 | import ServiceDisabled from './ServiceDisabled'; | 13 | import ServiceDisabled from './ServiceDisabled'; |
14 | import ServiceWebview from './ServiceWebview'; | 14 | import ServiceWebview from './ServiceWebview'; |
15 | import SettingsStore from '../../../stores/SettingsStore'; | 15 | import SettingsStore from '../../../stores/SettingsStore'; |
16 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; | ||
16 | 17 | ||
17 | export default @observer @inject('stores') class ServiceView extends Component { | 18 | export default @observer @inject('stores') class ServiceView extends Component { |
18 | static propTypes = { | 19 | static propTypes = { |
@@ -177,18 +178,31 @@ export default @observer @inject('stores') class ServiceView extends Component { | |||
177 | </Fragment> | 178 | </Fragment> |
178 | ) : ( | 179 | ) : ( |
179 | <> | 180 | <> |
180 | {!this.state.hibernate ? ( | 181 | {service.isServiceAccessRestricted ? ( |
181 | <ServiceWebview | 182 | <ServiceRestricted |
182 | service={service} | 183 | name={service.recipe.name} |
183 | setWebviewReference={setWebviewReference} | 184 | upgrade={upgrade} |
184 | detachService={detachService} | 185 | type={service.restrictionType} |
185 | /> | 186 | /> |
186 | ) : ( | 187 | ) : ( |
187 | <div> | 188 | <> |
188 | <span role="img" aria-label="Sleeping Emoji">😴</span> | 189 | {service.recipe.id === 'franz-custom-website' && ( |
189 | {' '} | 190 | <WebControlsScreen service={service} /> |
190 | This service is currently hibernating. If this page doesn't close soon, please try reloading Ferdi. | 191 | )} |
191 | </div> | 192 | {!this.state.hibernate ? ( |
193 | <ServiceWebview | ||
194 | service={service} | ||
195 | setWebviewReference={setWebviewReference} | ||
196 | detachService={detachService} | ||
197 | /> | ||
198 | ) : ( | ||
199 | <div> | ||
200 | <span role="img" aria-label="Sleeping Emoji">😴</span> | ||
201 | {' '} | ||
202 | This service is currently hibernating. If this page doesn't close soon, please try reloading Ferdi. | ||
203 | </div> | ||
204 | )} | ||
205 | </> | ||
192 | )} | 206 | )} |
193 | </> | 207 | </> |
194 | )} | 208 | )} |
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index 647e31d52..03d6d5bcc 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js | |||
@@ -59,6 +59,7 @@ class ServiceWebview extends Component { | |||
59 | }} | 59 | }} |
60 | onUpdateTargetUrl={this.updateTargetUrl} | 60 | onUpdateTargetUrl={this.updateTargetUrl} |
61 | useragent={service.userAgent} | 61 | useragent={service.userAgent} |
62 | disablewebsecurity={service.recipe.disablewebsecurity} | ||
62 | allowpopups | 63 | allowpopups |
63 | /> | 64 | /> |
64 | ); | 65 | ); |