diff options
author | Amine Mouafik <amine@mouafik.fr> | 2020-02-28 23:27:25 +0100 |
---|---|---|
committer | Amine Mouafik <amine@mouafik.fr> | 2020-02-28 23:27:25 +0100 |
commit | c896aafc7303eb970f9d0e655a5b3afd337c3272 (patch) | |
tree | 718918b497e105cfa6084b4aca5e2a8a559b2219 /src/components/services/content/ServiceView.js | |
parent | Merge branch 'develop' (diff) | |
parent | 5.4.4-beta.2 (diff) | |
download | ferdium-app-c896aafc7303eb970f9d0e655a5b3afd337c3272.tar.gz ferdium-app-c896aafc7303eb970f9d0e655a5b3afd337c3272.tar.zst ferdium-app-c896aafc7303eb970f9d0e655a5b3afd337c3272.zip |
Merge branch 'develop'
Diffstat (limited to 'src/components/services/content/ServiceView.js')
-rw-r--r-- | src/components/services/content/ServiceView.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/components/services/content/ServiceView.js b/src/components/services/content/ServiceView.js index 860863d26..f6832038a 100644 --- a/src/components/services/content/ServiceView.js +++ b/src/components/services/content/ServiceView.js | |||
@@ -135,9 +135,11 @@ export default @inject('stores', 'actions') @observer class ServiceView extends | |||
135 | } = this.props; | 135 | } = this.props; |
136 | 136 | ||
137 | const { | 137 | const { |
138 | showServiceNavigationBar, | 138 | navigationBarBehaviour, |
139 | } = stores.settings.app; | 139 | } = stores.settings.app; |
140 | 140 | ||
141 | const showNavBar = navigationBarBehaviour === 'always' || (navigationBarBehaviour === 'custom' && service.recipe.id === CUSTOM_WEBSITE_ID); | ||
142 | |||
141 | const webviewClasses = classnames({ | 143 | const webviewClasses = classnames({ |
142 | services__webview: true, | 144 | services__webview: true, |
143 | 'services__webview-wrapper': true, | 145 | 'services__webview-wrapper': true, |
@@ -193,7 +195,7 @@ export default @inject('stores', 'actions') @observer class ServiceView extends | |||
193 | <> | 195 | <> |
194 | {!service.isHibernating ? ( | 196 | {!service.isHibernating ? ( |
195 | <> | 197 | <> |
196 | {(service.recipe.id === CUSTOM_WEBSITE_ID || showServiceNavigationBar) && ( | 198 | {showNavBar && ( |
197 | <WebControlsScreen service={service} /> | 199 | <WebControlsScreen service={service} /> |
198 | )} | 200 | )} |
199 | <ServiceWebview | 201 | <ServiceWebview |