diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-10 12:08:35 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-10 12:08:35 +0100 |
commit | f5a9aa21e2ab958f60c143668f4836bc47e2b539 (patch) | |
tree | 7d7cb70dee56e6ca4a927f7789601cc428381659 /src/components/services/content | |
parent | feat(Service): Add option to mute service (diff) | |
download | ferdium-app-f5a9aa21e2ab958f60c143668f4836bc47e2b539.tar.gz ferdium-app-f5a9aa21e2ab958f60c143668f4836bc47e2b539.tar.zst ferdium-app-f5a9aa21e2ab958f60c143668f4836bc47e2b539.zip |
feat(App): Add option to mute all services in sidebar
Diffstat (limited to 'src/components/services/content')
-rw-r--r-- | src/components/services/content/ServiceWebview.js | 4 | ||||
-rw-r--r-- | src/components/services/content/Services.js | 3 |
2 files changed, 6 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 | /> |
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js index bad525d22..55a47cdd3 100644 --- a/src/components/services/content/Services.js +++ b/src/components/services/content/Services.js | |||
@@ -26,6 +26,7 @@ export default class Services extends Component { | |||
26 | handleIPCMessage: PropTypes.func.isRequired, | 26 | handleIPCMessage: PropTypes.func.isRequired, |
27 | openWindow: PropTypes.func.isRequired, | 27 | openWindow: PropTypes.func.isRequired, |
28 | reload: PropTypes.func.isRequired, | 28 | reload: PropTypes.func.isRequired, |
29 | isAppMuted: PropTypes.bool.isRequired, | ||
29 | }; | 30 | }; |
30 | 31 | ||
31 | static defaultProps = { | 32 | static defaultProps = { |
@@ -44,6 +45,7 @@ export default class Services extends Component { | |||
44 | setWebviewReference, | 45 | setWebviewReference, |
45 | openWindow, | 46 | openWindow, |
46 | reload, | 47 | reload, |
48 | isAppMuted, | ||
47 | } = this.props; | 49 | } = this.props; |
48 | const { intl } = this.context; | 50 | const { intl } = this.context; |
49 | 51 | ||
@@ -76,6 +78,7 @@ export default class Services extends Component { | |||
76 | setWebviewReference={setWebviewReference} | 78 | setWebviewReference={setWebviewReference} |
77 | openWindow={openWindow} | 79 | openWindow={openWindow} |
78 | reload={() => reload({ serviceId: service.id })} | 80 | reload={() => reload({ serviceId: service.id })} |
81 | isAppMuted={isAppMuted} | ||
79 | /> | 82 | /> |
80 | ))} | 83 | ))} |
81 | </div> | 84 | </div> |