From d422d2e160e818dd0bff90707d0c0832c8c3367b Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 22 Dec 2017 20:53:45 +0100 Subject: setBadge debugging --- src/stores/ServicesStore.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/stores/ServicesStore.js') diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 66f37af26..2417181e6 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -503,6 +503,7 @@ export default class ServicesStore extends Store { // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases if (showMessageBadgesEvenWhenMuted) { + console.log('set badge', unreadDirectMessageCount, unreadIndirectMessageCount); this.actions.app.setBadge({ unreadDirectMessageCount, unreadIndirectMessageCount, -- cgit v1.2.3-54-g00ecf From 344c25061f6a780da2db55e1ec5a66024a580dba Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 22 Dec 2017 23:20:48 +0100 Subject: Fix indirect message badge being displayed when disabled --- src/stores/ServicesStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/stores/ServicesStore.js') diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 2417181e6..c48f48a88 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -497,7 +497,7 @@ export default class ServicesStore extends Store { .reduce((a, b) => a + b, 0); const unreadIndirectMessageCount = this.allDisplayed - .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) + .filter(s => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled)) .map(s => s.unreadIndirectMessageCount) .reduce((a, b) => a + b, 0); -- cgit v1.2.3-54-g00ecf From 7293492403d8d4c8441eb58cdb391f5476608cfa Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Sat, 23 Dec 2017 00:02:30 +0100 Subject: fix(Service): Ctrl/Cmd+R now navigates back to the service root --- src/stores/ServicesStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/stores/ServicesStore.js') diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 66f37af26..6c1e757dc 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -368,7 +368,7 @@ export default class ServicesStore extends Store { const service = this.one(serviceId); service.resetMessageCount(); - service.webview.reload(); + service.webview.loadURL(service.url); } @action _reloadActive() { -- cgit v1.2.3-54-g00ecf