mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-02-02 17:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Affichage dynamique des favoris non lus

Browse Source 
Corrige https://github.com/marienfressinaud/FreshRSS/issues/222
Il reste toujours une situation curieuse lorsqu'on a fini de lire tous
les favoris non-lus, mais à voir une autre fois
This commit is contained in:
Alexandre Alapetite
2013-11-09 00:46:43 +01:00
parent ac7b805140
commit bdb69080f8
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/Entry.php
View File

@@ -487,11 +487,6 @@ class EntryDAO extends Model_pdo {
return $readUnread;
}
public function countFavorites () { //Deprecated: use countUnreadReadFavorites() instead
$unreadRead = $this->countUnreadReadFavorites (); //This makes better use of caching
return $unreadRead['unread'] + $unreadRead['read'];
}
public function optimizeTable() {
$sql = 'OPTIMIZE TABLE ' . $this->prefix . 'entry';
$stm = $this->bd->prepare ($sql);

23
public/scripts/main.js
View File

@@ -72,6 +72,13 @@ function mark_read(active, only_not_read) {
elem.setAttribute('data-unread', Math.max(0, feed_unread + inc));
}
//Update unread: favourites
if (active.closest('div').hasClass('favorite')) {
elem = $('#aside_flux .favorites').children(':first').get(0);
feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0;
elem.setAttribute('data-unread', Math.max(0, feed_unread + inc));
}
//Update unread: title
document.title = document.title.replace(/((?: \(\d+\))?)( - .*?)((?: \(\d+\))?)$/, function (m, p1, p2, p3) {
return incLabel(p1, inc) + p2 + incLabel(p3, feed_priority > 0 ? inc : 0);
@@ -112,6 +119,12 @@ function mark_favorite(active) {
return incLabel(p1, inc);
});
}
if (active.closest('div').hasClass('not_read')) {
var elem = $('#aside_flux .favorites').children(':first').get(0),
feed_unread = elem ? (parseInt(elem.getAttribute('data-unread'), 10) || 0) : 0;
elem.setAttribute('data-unread', Math.max(0, feed_unread + inc));
}
});
}
@@ -193,15 +206,6 @@ function next_entry() {
}
}
/*function init_img() {
var maxWidth = $(".flux_content .content").width() / 2;
$(".flux_content .content img").each(function () {
if ($(this).width() > maxWidth) {
$(this).addClass("big");
}
});
}*/
function inMarkViewport(flux, box_to_follow, relative_follow) {
var top = flux.position().top;
if (relative_follow) {
@@ -229,7 +233,6 @@ function init_lazyload() {
}
function init_posts() {
//init_img(); //Alex
init_lazyload();
var box_to_follow = $(window),