From b68c5c6630c7b014ee29d0c782054faaa3aeb4fe Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 9 Aug 2014 22:00:20 +0200 Subject: Dynamic favicon: remove the same number in the title Now the number of unread articles in only shown in the favicon https://github.com/marienfressinaud/FreshRSS/issues/539 --- app/Controllers/indexController.php | 3 --- p/scripts/main.js | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php index 9a46bde6c..3119073b8 100755 --- a/app/Controllers/indexController.php +++ b/app/Controllers/indexController.php @@ -69,9 +69,6 @@ class FreshRSS_index_Controller extends Minz_ActionController { // mise à jour des titres $this->view->rss_title = $this->view->currentName . ' | ' . Minz_View::title(); - if ($this->view->nb_not_read > 0) { - Minz_View::prependTitle('(' . formatNumber($this->view->nb_not_read) . ') '); - } Minz_View::prependTitle( ($this->nb_not_read_cat > 0 ? '(' . formatNumber($this->nb_not_read_cat) . ') ' : '') . $this->view->currentName . diff --git a/p/scripts/main.js b/p/scripts/main.js index a91e23400..ae7b69364 100644 --- a/p/scripts/main.js +++ b/p/scripts/main.js @@ -106,16 +106,16 @@ function incUnreadsFeed(article, feed_id, nb) { var isCurrentView = false; //Update unread: title - document.title = document.title.replace(/^((?:\([ 0-9]+\) )?)(.*? · )((?:\([ 0-9]+\) )?)/, function (m, p1, p2, p3) { + document.title = document.title.replace(/^((?:\([ 0-9]+\) )?)/, function (m, p1) { var $feed = $('#' + feed_id); if (article || ($feed.closest('.active').length > 0 && $feed.siblings('.active').length === 0)) { isCurrentView = true; - return incLabel(p1, nb, true) + p2 + incLabel(p3, feed_priority > 0 ? nb : 0, true); + return incLabel(p1, nb, true); } else if ($('.all.active').length > 0) { isCurrentView = feed_priority > 0; - return incLabel(p1, feed_priority > 0 ? nb : 0, true) + p2 + incLabel(p3, feed_priority > 0 ? nb : 0, true); + return incLabel(p1, feed_priority > 0 ? nb : 0, true); } else { - return p1 + p2 + incLabel(p3, feed_priority > 0 ? nb : 0, true); + return p1; } }); return isCurrentView; -- cgit v1.2.3