Bug "mark all as read" when using DESC and pagination

https://github.com/marienfressinaud/FreshRSS/issues/431#issuecomment-35710258
pull/433/head
Alexandre Alapetite 11 years ago
parent d7083803c3
commit 7afd9e398a
  1. 1
      app/views/helpers/javascript_vars.phtml
  2. 4
      p/scripts/main.js

@ -5,6 +5,7 @@ echo '"use strict";', "\n";
$mark = $this->conf->mark_when; $mark = $this->conf->mark_when;
echo 'var ', echo 'var ',
'hide_posts=', ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'false' : 'true', 'hide_posts=', ($this->conf->display_posts || Minz_Request::param('output') === 'reader') ? 'false' : 'true',
',display_order="', Minz_Request::param('order', $this->conf->sort_order), '"',
',auto_mark_article=', $mark['article'] ? 'true' : 'false', ',auto_mark_article=', $mark['article'] ? 'true' : 'false',
',auto_mark_site=', $mark['site'] ? 'true' : 'false', ',auto_mark_site=', $mark['site'] ? 'true' : 'false',
',auto_mark_scroll=', $mark['scroll'] ? 'true' : 'false', ',auto_mark_scroll=', $mark['scroll'] ? 'true' : 'false',

@ -774,7 +774,11 @@ function load_more_posts() {
$.get(url_load_more, function (data) { $.get(url_load_more, function (data) {
box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day')); box_load_more.children('.flux:last').after($('#stream', data).children('.flux, .day'));
$('.pagination').replaceWith($('.pagination', data)); $('.pagination').replaceWith($('.pagination', data));
if (display_order === 'ASC') {
$('#nav_menu_read_all>a').attr('href', $('#bigMarkAsRead').attr('href'));
} else {
$('#bigMarkAsRead').attr('href', $('#nav_menu_read_all>a').attr('href')); $('#bigMarkAsRead').attr('href', $('#nav_menu_read_all>a').attr('href'));
}
$('[id^=day_]').each(function (i) { $('[id^=day_]').each(function (i) {
var ids = $('[id="' + this.id + '"]'); var ids = $('[id="' + this.id + '"]');

Loading…
Cancel
Save