aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/services/content/ServiceWebview.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-11-10 12:08:35 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2017-11-10 12:08:35 +0100
commitf5a9aa21e2ab958f60c143668f4836bc47e2b539 (patch)
tree7d7cb70dee56e6ca4a927f7789601cc428381659 /src/components/services/content/ServiceWebview.js
parentfeat(Service): Add option to mute service (diff)
downloadferdium-app-f5a9aa21e2ab958f60c143668f4836bc47e2b539.tar.gz
ferdium-app-f5a9aa21e2ab958f60c143668f4836bc47e2b539.tar.zst
ferdium-app-f5a9aa21e2ab958f60c143668f4836bc47e2b539.zip
feat(App): Add option to mute all services in sidebar
Closes #8 #162
Diffstat (limited to 'src/components/services/content/ServiceWebview.js')
-rw-r--r--src/components/services/content/ServiceWebview.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js
index d7e0a4f38..60bdf7e47 100644
--- a/src/components/services/content/ServiceWebview.js
+++ b/src/components/services/content/ServiceWebview.js
@@ -15,6 +15,7 @@ export default class ServiceWebview extends Component {
15 service: PropTypes.instanceOf(ServiceModel).isRequired, 15 service: PropTypes.instanceOf(ServiceModel).isRequired,
16 setWebviewReference: PropTypes.func.isRequired, 16 setWebviewReference: PropTypes.func.isRequired,
17 reload: PropTypes.func.isRequired, 17 reload: PropTypes.func.isRequired,
18 isAppMuted: PropTypes.bool.isRequired,
18 }; 19 };
19 20
20 static defaultProps = { 21 static defaultProps = {
@@ -56,6 +57,7 @@ export default class ServiceWebview extends Component {
56 service, 57 service,
57 setWebviewReference, 58 setWebviewReference,
58 reload, 59 reload,
60 isAppMuted,
59 } = this.props; 61 } = this.props;
60 62
61 const webviewClasses = classnames({ 63 const webviewClasses = classnames({
@@ -92,7 +94,7 @@ export default class ServiceWebview extends Component {
92 })} 94 })}
93 onUpdateTargetUrl={this.updateTargetUrl} 95 onUpdateTargetUrl={this.updateTargetUrl}
94 useragent={service.userAgent} 96 useragent={service.userAgent}
95 muted={service.isMuted} 97 muted={isAppMuted || service.isMuted}
96 disablewebsecurity 98 disablewebsecurity
97 allowpopups 99 allowpopups
98 /> 100 />