diff options
author | Stefan Malzner <stefan@adlk.io> | 2018-01-03 23:50:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-03 23:50:59 +0100 |
commit | a74ce8d78d4db3f08bec5e0e3d6eb47fae763e40 (patch) | |
tree | 5c2738adaa132570ffa8f5173b9508e9eda87b06 /src/stores/ServicesStore.js | |
parent | feat(App): Add option to clear app cache (@dannyqiu) (diff) | |
parent | Merge pull request #533 from meetfranz/feature/ux-service-search (diff) | |
download | ferdium-app-a74ce8d78d4db3f08bec5e0e3d6eb47fae763e40.tar.gz ferdium-app-a74ce8d78d4db3f08bec5e0e3d6eb47fae763e40.tar.zst ferdium-app-a74ce8d78d4db3f08bec5e0e3d6eb47fae763e40.zip |
Merge branch 'develop' into service-cache-cleanup
Diffstat (limited to 'src/stores/ServicesStore.js')
-rw-r--r-- | src/stores/ServicesStore.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 237264bcc..87ee57a0d 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
@@ -377,7 +377,7 @@ export default class ServicesStore extends Store { | |||
377 | const service = this.one(serviceId); | 377 | const service = this.one(serviceId); |
378 | service.resetMessageCount(); | 378 | service.resetMessageCount(); |
379 | 379 | ||
380 | service.webview.reload(); | 380 | service.webview.loadURL(service.url); |
381 | } | 381 | } |
382 | 382 | ||
383 | @action _reloadActive() { | 383 | @action _reloadActive() { |
@@ -506,12 +506,13 @@ export default class ServicesStore extends Store { | |||
506 | .reduce((a, b) => a + b, 0); | 506 | .reduce((a, b) => a + b, 0); |
507 | 507 | ||
508 | const unreadIndirectMessageCount = this.allDisplayed | 508 | const unreadIndirectMessageCount = this.allDisplayed |
509 | .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) | 509 | .filter(s => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled)) |
510 | .map(s => s.unreadIndirectMessageCount) | 510 | .map(s => s.unreadIndirectMessageCount) |
511 | .reduce((a, b) => a + b, 0); | 511 | .reduce((a, b) => a + b, 0); |
512 | 512 | ||
513 | // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases | 513 | // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases |
514 | if (showMessageBadgesEvenWhenMuted) { | 514 | if (showMessageBadgesEvenWhenMuted) { |
515 | console.log('set badge', unreadDirectMessageCount, unreadIndirectMessageCount); | ||
515 | this.actions.app.setBadge({ | 516 | this.actions.app.setBadge({ |
516 | unreadDirectMessageCount, | 517 | unreadDirectMessageCount, |
517 | unreadIndirectMessageCount, | 518 | unreadIndirectMessageCount, |