aboutsummaryrefslogtreecommitdiffstats
path: root/src/models/Service.js
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-12-15 14:44:46 +0100
committerLibravatar GitHub <noreply@github.com>2017-12-15 14:44:46 +0100
commitdc1dd2e857114fac2462f18ea774ddacb287fa81 (patch)
tree32b701de50c505abc95ceddc7c429df85c81f041 /src/models/Service.js
parentRemove IME handlers (diff)
parentMerge pull request #475 from meetfranz/feature/service-improvements (diff)
downloadferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.tar.gz
ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.tar.zst
ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.zip
Merge branch 'develop' into feature/macOS-copy-paste
Diffstat (limited to 'src/models/Service.js')
-rw-r--r--src/models/Service.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/models/Service.js b/src/models/Service.js
index 958e4b11e..0b19440e7 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -22,6 +22,7 @@ export default class Service {
22 @observable team = ''; 22 @observable team = '';
23 @observable customUrl = ''; 23 @observable customUrl = '';
24 @observable isNotificationEnabled = true; 24 @observable isNotificationEnabled = true;
25 @observable isBadgeEnabled = true;
25 @observable isIndirectMessageBadgeEnabled = true; 26 @observable isIndirectMessageBadgeEnabled = true;
26 @observable customIconUrl = ''; 27 @observable customIconUrl = '';
27 @observable hasCrashed = false; 28 @observable hasCrashed = false;
@@ -52,6 +53,9 @@ export default class Service {
52 this.isNotificationEnabled = data.isNotificationEnabled !== undefined 53 this.isNotificationEnabled = data.isNotificationEnabled !== undefined
53 ? data.isNotificationEnabled : this.isNotificationEnabled; 54 ? data.isNotificationEnabled : this.isNotificationEnabled;
54 55
56 this.isBadgeEnabled = data.isBadgeEnabled !== undefined
57 ? data.isBadgeEnabled : this.isBadgeEnabled;
58
55 this.isIndirectMessageBadgeEnabled = data.isIndirectMessageBadgeEnabled !== undefined 59 this.isIndirectMessageBadgeEnabled = data.isIndirectMessageBadgeEnabled !== undefined
56 ? data.isIndirectMessageBadgeEnabled : this.isIndirectMessageBadgeEnabled; 60 ? data.isIndirectMessageBadgeEnabled : this.isIndirectMessageBadgeEnabled;
57 61