Browse Source

Bug articles disponibles

https://github.com/marienfressinaud/FreshRSS/issues/379
Alexandre Alapetite 12 years ago
parent
commit
fbf48f5861
1 changed files with 4 additions and 2 deletions
  1. 4 2
      p/scripts/main.js

+ 4 - 2
p/scripts/main.js

@@ -62,7 +62,8 @@ function incUnreadsFeed(article, feed_id, nb) {
 	var isCurrentView = false;
 	//Update unread: title
 	document.title = document.title.replace(/((?: \(\d+\))?)( · .*?)((?: \(\d+\))?)$/, function (m, p1, p2, p3) {
-		if (article || ($('#' + feed_id).closest('.active').length > 0)) {
+		var $feed = $('#' + feed_id);
+		if (article || ($feed.closest('.active').length > 0 && $feed.siblings('.active').length === 0)) {
 			isCurrentView = true;
 			return incLabel(p1, nb) + p2 + incLabel(p3, feed_priority > 0 ? nb : 0);
 		} else {
@@ -522,11 +523,12 @@ function init_notifications() {
 
 function refreshUnreads() {
 	$.getJSON('./?c=javascript&a=nbUnreadsPerFeed').done(function (data) {
+		var isAll = $('.category.all > .active').length > 0;
 		$.each(data, function(feed_id, nbUnreads) {
 			feed_id = 'f_' + feed_id;
 			var elem = $('#' + feed_id + '>.feed').get(0),
 				feed_unreads = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0;
-			if (incUnreadsFeed(null, feed_id, nbUnreads - feed_unreads) &&	//Update of current view?
+			if ((incUnreadsFeed(null, feed_id, nbUnreads - feed_unreads) || isAll) &&	//Update of current view?
 				(nbUnreads - feed_unreads > 0)) {
 				$('#new-article').show();
 			};