From 15ae8cd0844b5beaee016ac769ec215adc0b4959 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Jul 2015 13:30:00 +0300 Subject: [PATCH] js: remove current_top_id global --- js/feedlist.js | 8 ++++++-- js/viewfeed.js | 6 ------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/js/feedlist.js b/js/feedlist.js index ffcecc7c..54ad1cc5 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -99,8 +99,12 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req, can_w query = query + "&m=" + param_escape(method); } - if (current_top_article_id && offset > 0) { - query = query + "&topid=" + param_escape(current_top_article_id); + if (offset > 0) { + var firstRow = $$('div[id*="RROW-"]').first(); + + if (firstRow) { + query = query + "&topid=" + param_escape(parseInt(firstRow.id.replace("RROW-", ""))); + } } if (!background) { diff --git a/js/viewfeed.js b/js/viewfeed.js index b4bf69a7..5c437c7b 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -13,7 +13,6 @@ var catchup_timeout_id = false; var cids_requested = []; var loaded_article_ids = []; var _last_headlines_update = 0; -var current_top_article_id = false; var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null; @@ -84,7 +83,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) { if (infscroll_req == false) { loaded_article_ids = []; - current_top_article_id = false; dijit.byId("headlines-frame").attr('content', reply['headlines']['content']); @@ -104,10 +102,6 @@ function headlines_callback2(transport, offset, background, infscroll_req) { } }); - if (loaded_article_ids.size() > 0) { - current_top_article_id = parseInt(loaded_article_ids[0].replace("RROW-", "")); - } - var hsp = $("headlines-spacer"); if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"}); dijit.byId('headlines-frame').domNode.appendChild(hsp); -- 2.39.5