diff options
author | 2019-10-04 15:27:40 +0700 | |
---|---|---|
committer | 2019-10-04 15:27:40 +0700 | |
commit | d8d5df6e72163b00e035f729b1013a957fed2321 (patch) | |
tree | ee0993c8b3d1ddb551aafa71b1e6bf932500ef3d /src/components | |
parent | Better handling for user data path (#100) (diff) | |
parent | Fix lint (diff) | |
download | ferdium-app-d8d5df6e72163b00e035f729b1013a957fed2321.tar.gz ferdium-app-d8d5df6e72163b00e035f729b1013a957fed2321.tar.zst ferdium-app-d8d5df6e72163b00e035f729b1013a957fed2321.zip |
Merge branch 'develop' of github.com:getferdi/ferdi into develop
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/services/content/ServiceView.js | 6 | ||||
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index c45acc961..0cfefc92b 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,6 +178,9 @@ export default @observer @inject('stores') class ServiceView extends Component { | |||
177 | </Fragment> | 178 | </Fragment> |
178 | ) : ( | 179 | ) : ( |
179 | <> | 180 | <> |
181 | {service.recipe.id === 'franz-custom-website' && ( | ||
182 | <WebControlsScreen service={service} /> | ||
183 | )} | ||
180 | {!this.state.hibernate ? ( | 184 | {!this.state.hibernate ? ( |
181 | <ServiceWebview | 185 | <ServiceWebview |
182 | service={service} | 186 | service={service} |
@@ -187,7 +191,7 @@ export default @observer @inject('stores') class ServiceView extends Component { | |||
187 | <div> | 191 | <div> |
188 | <span role="img" aria-label="Sleeping Emoji">😴</span> | 192 | <span role="img" aria-label="Sleeping Emoji">😴</span> |
189 | {' '} | 193 | {' '} |
190 | This service is currently hibernating. If this page doesn't close soon, please try reloading Ferdi. | 194 | This service is currently hibernating. If this page doesn't close soon, please try reloading Ferdi. |
191 | </div> | 195 | </div> |
192 | )} | 196 | )} |
193 | </> | 197 | </> |
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 | ); |