Bläddra i källkod

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

https://github.com/marienfressinaud/FreshRSS/issues/431#issuecomment-35710258
Alexandre Alapetite 12 år sedan
förälder
incheckning
7afd9e398a
2 ändrade filer med 6 tillägg och 1 borttagningar
  1. 1 0
      app/views/helpers/javascript_vars.phtml
  2. 5 1
      p/scripts/main.js

+ 1 - 0
app/views/helpers/javascript_vars.phtml

@@ -5,6 +5,7 @@ echo '"use strict";', "\n";
 $mark = $this->conf->mark_when;
 echo 'var ',
 	'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_site=', $mark['site'] ? 'true' : 'false',
 	',auto_mark_scroll=', $mark['scroll'] ? 'true' : 'false',

+ 5 - 1
p/scripts/main.js

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