From b405ba11aa3c669a21831d016084e0c47bffdebc Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 9 Nov 2017 16:28:03 +0100 Subject: feat(Service): Add option to mute service --- src/components/services/content/ServiceWebview.js | 6 +----- .../settings/services/EditServiceForm.js | 12 ++++++++++-- src/components/settings/services/ServiceItem.js | 22 +++++++++++++++------- 3 files changed, 26 insertions(+), 14 deletions(-) (limited to 'src/components') diff --git a/src/components/services/content/ServiceWebview.js b/src/components/services/content/ServiceWebview.js index cd59e0a8a..d7e0a4f38 100644 --- a/src/components/services/content/ServiceWebview.js +++ b/src/components/services/content/ServiceWebview.js @@ -82,21 +82,17 @@ export default class ServiceWebview extends Component { )} { this.webview = element; }} - autosize src={service.url} preload="./webview/plugin.js" partition={`persist:service-${service.id}`} - onDidAttach={() => setWebviewReference({ serviceId: service.id, webview: this.webview.view, })} - onUpdateTargetUrl={this.updateTargetUrl} - useragent={service.userAgent} - + muted={service.isMuted} disablewebsecurity allowpopups /> diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 9b359a78e..753781507 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -61,7 +61,11 @@ const messages = defineMessages({ }, indirectMessageInfo: { id: 'settings.service.form.indirectMessageInfo', - defaultMessage: '!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...', // eslint-disable-line + defaultMessage: '!!!You will be notified about all new messages in a channel, not just @username, @channel, @here, ...', + }, + isMutedInfo: { + id: 'settings.service.form.isMutedInfo', + defaultMessage: '!!!When disabled, all notification sounds and audio playback are muted', }, }); @@ -231,11 +235,15 @@ export default class EditServiceForm extends Component { {recipe.hasIndirectMessages && (
-

+

{intl.formatMessage(messages.indirectMessageInfo)}

)} + +

+ {intl.formatMessage(messages.isMutedInfo)} +

{recipe.message && ( diff --git a/src/components/settings/services/ServiceItem.js b/src/components/settings/services/ServiceItem.js index 20d8581d0..9743315b0 100644 --- a/src/components/settings/services/ServiceItem.js +++ b/src/components/settings/services/ServiceItem.js @@ -16,6 +16,10 @@ const messages = defineMessages({ id: 'settings.services.tooltip.notificationsDisabled', defaultMessage: '!!!Notifications are disabled', }, + tooltipIsMuted: { + id: 'settings.services.tooltip.isMuted', + defaultMessage: '!!!All sounds are muted', + }, }); @observer @@ -62,6 +66,17 @@ export default class ServiceItem extends Component { > {service.name !== '' ? service.name : service.recipe.name} + + {service.isMuted && ( + + )} + - {/* - - */} ); } -- cgit v1.2.3-54-g00ecf