Merge pull request #122 from lorenzhs/fixfavico

Fix Favico
This commit is contained in:
David Cormier 2014-02-02 06:40:24 -08:00
commit 38ac95c863
1 changed files with 15 additions and 11 deletions

View File

@ -499,21 +499,25 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
// Check if we should show nicklist or not // Check if we should show nicklist or not
$scope.showNicklist = $scope.updateShowNicklist(); $scope.showNicklist = $scope.updateShowNicklist();
}); });
$scope.favico = new Favico({animation: 'none'});
$rootScope.$on('notificationChanged', function() { $rootScope.$on('notificationChanged', function() {
var notifications = _.reduce(models.model.buffers, function(memo, num) { return (parseInt(memo)||0) + num.notification;}); var notifications = _.reduce(models.model.buffers, function(memo, num) { return (parseInt(memo)||0) + num.notification;});
if (notifications > 0 ) { if (typeof(notifications) !== 'number') return;
$scope.favico = new Favico({ if (notifications > 0) {
animation:'none' $scope.favico.badge(notifications, {
bgColor: '#d00',
textColor: '#fff'
}); });
$scope.favico.badge(notifications); } else {
}else {
var unread = _.reduce(models.model.buffers, function(memo, num) { return (parseInt(memo)||0) + num.unread;}); var unread = _.reduce(models.model.buffers, function(memo, num) { return (parseInt(memo)||0) + num.unread;});
$scope.favico = new Favico({ if (unread === 0) {
animation:'none', $scope.favico.reset();
bgColor : '#5CB85C', } else {
textColor : '#ff0' $scope.favico.badge(unread, {
}); bgColor: '#5CB85C',
$scope.favico.badge(unread); textColor: '#ff0'
});
}
} }
}); });