diff options
author | vantezzen <hello@vantezzen.io> | 2019-10-09 09:48:41 +0200 |
---|---|---|
committer | vantezzen <hello@vantezzen.io> | 2019-10-09 09:48:41 +0200 |
commit | da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af (patch) | |
tree | a189f4566c6380b86aeb04b9307aea23fc6e14d7 /src/components/services/content/ServiceView.js | |
parent | Update zh-HANT.json (diff) | |
parent | Update CHANGELOG.md (diff) | |
download | ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.tar.gz ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.tar.zst ferdium-app-da9e8a3d5b11efcc8eeee325c0ac7eb7840f75af.zip |
Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.4.0
Diffstat (limited to 'src/components/services/content/ServiceView.js')
-rw-r--r-- | src/components/services/content/ServiceView.js | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index f6686548d..273653ea2 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -13,6 +13,7 @@ import ServiceDisabled from './ServiceDisabled'; | |||
13 | import ServiceWebview from './ServiceWebview'; | 13 | import ServiceWebview from './ServiceWebview'; |
14 | import SettingsStore from '../../../stores/SettingsStore'; | 14 | import SettingsStore from '../../../stores/SettingsStore'; |
15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; | 15 | import WebControlsScreen from '../../../features/webControls/containers/WebControlsScreen'; |
16 | import { CUSTOM_WEBSITE_ID } from '../../../features/webControls/constants'; | ||
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 = { |
@@ -183,11 +184,16 @@ export default @observer @inject('stores') class ServiceView extends Component { | |||
183 | <WebControlsScreen service={service} /> | 184 | <WebControlsScreen service={service} /> |
184 | )} | 185 | )} |
185 | {!this.state.hibernate ? ( | 186 | {!this.state.hibernate ? ( |
186 | <ServiceWebview | 187 | <> |
187 | service={service} | 188 | {service.recipe.id === CUSTOM_WEBSITE_ID && ( |
188 | setWebviewReference={setWebviewReference} | 189 | <WebControlsScreen service={service} /> |
189 | detachService={detachService} | 190 | )} |
190 | /> | 191 | <ServiceWebview |
192 | service={service} | ||
193 | setWebviewReference={setWebviewReference} | ||
194 | detachService={detachService} | ||
195 | /> | ||
196 | </> | ||
191 | ) : ( | 197 | ) : ( |
192 | <div> | 198 | <div> |
193 | <span role="img" aria-label="Sleeping Emoji">😴</span> | 199 | <span role="img" aria-label="Sleeping Emoji">😴</span> |