Browse Source

Merge branch 'master' of https://github.com/saenzramiro/rambox

pull/1193/head
Ramiro Saenz 8 years ago
parent
commit
a3b4a16917
  1. 2
      app/package.json
  2. 2
      app/store/ServicesList.js
  3. 2
      app/view/main/MainController.js
  4. 2
      appveyor.yml

2
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,

2
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'

2
app/view/main/MainController.js

@ -273,6 +273,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);

2
appveyor.yml

@ -1,4 +1,4 @@
version: 0.5.11
version: 0.5.12
pull_requests:
do_not_increment_build_number: true
branches:

Loading…
Cancel
Save