From 5db8c2d3d97b24b6414c38346d98f79120b606e6 Mon Sep 17 00:00:00 2001 From: Ramiro Saenz Date: Wed, 6 Sep 2017 09:49:04 -0300 Subject: [PATCH 1/3] Fixed Don't Disturb bug when a services is disabled --- app/view/main/MainController.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/view/main/MainController.js b/app/view/main/MainController.js index ab93b03d..7fc34cda 100644 --- a/app/view/main/MainController.js +++ b/app/view/main/MainController.js @@ -236,6 +236,8 @@ Ext.define('Rambox.view.main.MainController', { // Get Tab var tab = Ext.getCmp('tab_'+serviceId); + if ( !tab ) return; // Skip disabled services + // Mute sounds tab.setAudioMuted(btn.pressed ? true : tab.record.get('muted'), true); From 43b12907bbcdab6eb5343a9eccf0d277e2534d47 Mon Sep 17 00:00:00 2001 From: Ramiro Saenz Date: Wed, 6 Sep 2017 09:50:39 -0300 Subject: [PATCH 2/3] Versioning --- app/package.json | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/package.json b/app/package.json index d305d865..ec984b65 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "Rambox", "productName": "Rambox", - "version": "0.5.11", + "version": "0.5.12", "description": "Rambox", "main": "electron/main.js", "private": true, diff --git a/appveyor.yml b/appveyor.yml index 3eb8546e..892787c7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.5.11 +version: 0.5.12 pull_requests: do_not_increment_build_number: true branches: From 5a3e44bea98f244a3da12de5a55449b150f9d639 Mon Sep 17 00:00:00 2001 From: Justin Cherniak Date: Thu, 21 Sep 2017 12:52:20 -0700 Subject: [PATCH 3/3] Ignore muted channels when considering whether to show an indicator for Slack --- app/store/ServicesList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/store/ServicesList.js b/app/store/ServicesList.js index 92adb130..b4d2338c 100644 --- a/app/store/ServicesList.js +++ b/app/store/ServicesList.js @@ -38,7 +38,7 @@ Ext.define('Rambox.store.ServicesList', { ,description: locale['services[1]'] ,url: 'https://___.slack.com/' ,type: 'messaging' - ,js_unread: 'function checkUnread(){var e=$(".p-channel_sidebar__channel--unread").length,a=0;$(".p-channel_sidebar__badge").each(function(){a+=isNaN(parseInt($(this).html()))?0:parseInt($(this).html())}),updateBadge(e,a)}function updateBadge(e,a){var n=a>0?"("+a+") ":e>0?"(•) ":"";document.title=n+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);' + ,js_unread: 'function checkUnread(){var e=$(".p-channel_sidebar__channel--unread:not(.p-channel_sidebar__channel--muted)").length,a=0;$(".p-channel_sidebar__badge").each(function(){a+=isNaN(parseInt($(this).html()))?0:parseInt($(this).html())}),updateBadge(e,a)}function updateBadge(e,a){var n=a>0?"("+a+") ":e>0?"(•) ":"";document.title=n+originalTitle}var originalTitle=document.title;setInterval(checkUnread,3e3);' }, { id: 'noysi'