var _infscroll_disable = 0;
var _infscroll_request_sent = 0;
var _search_query = false;
-
-var counter_timeout_id = false;
+var _viewfeed_last = 0;
var counters_last_request = 0;
var offset = 0;
var view_mode = document.forms["main_toolbar_form"].view_mode.value;
- var num_unread = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
+ var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length;
var num_all = $$("#headlines-frame > div[id*=RROW]").length;
+ var num_unread = getFeedUnread(getActiveFeedId(), activeFeedIsCat());
// TODO implement marked & published
console.warn("loadMoreHeadlines: published is not implemented, falling back.");
offset = num_all;
} else if (view_mode == "unread") {
- offset = num_unread;
+ offset = unread_in_buffer;
+ } else if (_search_query) {
+ offset = num_all;
} else if (view_mode == "adaptive") {
if (num_unread > 0)
- offset = num_unread;
+ offset = unread_in_buffer;
else
offset = num_all;
} else {
offset = num_all;
}
+ console.log("offset: " + offset);
+
viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset, false, true);
} catch (e) {
last_requested_article = 0;
- var cached_headlines = false;
-
- if (feed == getActiveFeedId()) {
- cache_delete("feed:" + feed + ":" + is_cat);
- } else {
- cached_headlines = cache_get("feed:" + feed + ":" + is_cat);
-
- // switching to a different feed, we might as well catchup stuff visible
- // in headlines buffer (if any)
- if (!background && isCdmMode() && getInitParam("cdm_auto_catchup") == 1 && parseInt(getActiveFeedId()) > 0) {
-
- $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
- function(child) {
- var hf = $("headlines-frame");
-
- if (hf.scrollTop + hf.offsetHeight >=
- child.offsetTop + child.offsetHeight) {
-
- var id = child.id.replace("RROW-", "");
-
- if (catchup_id_batch.indexOf(id) == -1)
- catchup_id_batch.push(id);
-
- }
-
- if (catchup_id_batch.length > 0) {
- window.clearTimeout(catchup_timeout_id);
-
- if (!_infscroll_request_sent) {
- catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
- 2000);
- }
- }
-
- });
- }
+ if (feed != getActiveFeedId() || activeFeedIsCat() != is_cat) {
+ if (!background && _search_query) _search_query = false;
}
- if (offset == 0 && !background)
- dijit.byId("content-tabs").selectChild(
- dijit.byId("content-tabs").getChildren()[0]);
-
if (!background) {
+ _viewfeed_last = get_timestamp();
+
if (getActiveFeedId() != feed || offset == 0) {
- active_post_id = 0;
+ setActiveArticleId(0);
_infscroll_disable = 0;
}
- if (!offset && !method && cached_headlines && !background) {
- try {
- render_local_headlines(feed, is_cat, JSON.parse(cached_headlines));
- return;
- } catch (e) {
- console.warn("render_local_headlines failed: " + e);
- }
- }
-
if (offset != 0 && !method) {
- var date = new Date();
- var timestamp = Math.round(date.getTime() / 1000);
+ var timestamp = get_timestamp();
if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
//console.log("infscroll request in progress, aborting");
_infscroll_request_sent = timestamp;
}
-
- hideAuxDlg();
}
Form.enable("main_toolbar_form");
var toolbar_query = Form.serialize("main_toolbar_form");
var query = "?op=feeds&method=view&feed=" + feed + "&" +
- toolbar_query + "&m=" + param_escape(method);
+ toolbar_query;
+
+ if (method) {
+ query = query + "&m=" + param_escape(method);
+ }
if (!background) {
if (_search_query) {
force_nocache = true;
query = query + "&" + _search_query;
- _search_query = false;
+ //_search_query = false;
}
if (offset != 0) {
if (vgroup_last_feed) {
query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
}
+ } else {
+ if (!method && !is_cat && feed == getActiveFeedId()) {
+ query = query + "&m=ForceUpdate";
+ }
}
Form.enable("main_toolbar_form");
- if (!offset)
- if (!is_cat) {
- if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
- notify_progress("Loading, please wait...", true);
- } else {
+ if (!setFeedExpandoIcon(feed, is_cat,
+ (is_cat) ? 'images/indicator_tiny.gif' : 'images/indicator_white.gif'))
notify_progress("Loading, please wait...", true);
- }
}
query += "&cat=" + is_cat;
try {
console.log("in feedlist init");
- hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
document.onkeydown = hotkey_handler;
setTimeout("hotkey_prefix_timeout()", 5*1000);
- if (!getActiveFeedId()) {
- setTimeout("viewfeed(-3)", 100);
+ if (!getActiveFeedId()) {
+ viewfeed(-3);
+ } else {
+ viewfeed(getActiveFeedId(), '', activeFeedIsCat());
}
- console.log("T:" +
- getInitParam("cdm_auto_catchup") + " " + getFeedUnread(-3));
-
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
- setTimeout("timeout()", 5000);
- setTimeout("precache_headlines_idle()", 3000);
+ request_counters(true);
+ timeout();
} catch (e) {
exception_error("feedlist/init", e);
}
}
-function request_counters_real() {
- try {
- console.log("requesting counters...");
-
- var query = "?op=rpc&method=getAllCounters&seq=" + next_seq();
-
- query = query + "&omode=flc";
-
- new Ajax.Request("backend.php", {
- parameters: query,
- onComplete: function(transport) {
- try {
- handle_rpc_json(transport);
- } catch (e) {
- exception_error("viewfeed/getcounters", e);
- }
- } });
-
- } catch (e) {
- exception_error("request_counters_real", e);
- }
-}
-
-
-function request_counters() {
+function request_counters(force) {
try {
-
- if (getInitParam("bw_limit") == "1") return;
-
var date = new Date();
var timestamp = Math.round(date.getTime() / 1000);
- if (timestamp - counters_last_request > 5) {
+ if (force || timestamp - counters_last_request > 5) {
console.log("scheduling request of counters...");
- window.clearTimeout(counter_timeout_id);
- counter_timeout_id = window.setTimeout("request_counters_real()", 1000);
-
counters_last_request = timestamp;
- } else {
- console.log("request_counters: rate limit reached: " + (timestamp - counters_last_request));
- }
- } catch (e) {
- exception_error("request_counters", e);
- }
-}
+ var query = "?op=rpc&method=getAllCounters&seq=" + next_seq();
-function displayNewContentPrompt(id) {
- try {
-
- var msg = "<a href='#' onclick='viewCurrentFeed()'>" +
- __("New articles available in this feed (click to show)") + "</a>";
+ if (!force)
+ query = query + "&last_article_id=" + getInitParam("last_article_id");
- msg = msg.replace("%s", getFeedName(id));
+ console.log(query);
- $('auxDlg').innerHTML = msg;
+ new Ajax.Request("backend.php", {
+ parameters: query,
+ onComplete: function(transport) {
+ try {
+ handle_rpc_json(transport);
+ } catch (e) {
+ exception_error("request_counters", e);
+ }
+ } });
- new Effect.Appear('auxDlg', {duration : 0.5});
+ } else {
+ console.log("request_counters: rate limit reached: " + (timestamp - counters_last_request));
+ }
} catch (e) {
- exception_error("displayNewContentPrompt", e);
+ exception_error("request_counters", e);
}
}
continue;
}
- // TODO: enable new content notification for categories
-
- if (!activeFeedIsCat() && id == getActiveFeedId()
- && ctr > getFeedUnread(id) && scheduled_call) {
- displayNewContentPrompt(id);
+ if (getFeedUnread(id, (kind == "cat")) != ctr ||
+ (kind == "cat")) {
}
- if (getFeedUnread(id, (kind == "cat")) != ctr)
- cache_delete("feed:" + id + ":" + (kind == "cat"));
-
setFeedUnread(id, (kind == "cat"), ctr);
if (kind != "cat") {
function catchupFeed(feed, is_cat) {
try {
+ if (is_cat == undefined) is_cat = false;
+
var str = __("Mark all articles in %s as read?");
var fn = getFeedName(feed, is_cat);
return;
}
+ var max_id = 0;
+
+ if (feed == getActiveFeedId() && is_cat == activeFeedIsCat()) {
+ $$("#headlines-frame > div[id*=RROW]").each(
+ function(child) {
+ var id = parseInt(child.id.replace("RROW-", ""));
+
+ if (id > max_id) max_id = id;
+ }
+ );
+ }
+
var catchup_query = "?op=rpc&method=catchupFeed&feed_id=" +
- feed + "&is_cat=" + is_cat;
+ feed + "&is_cat=" + is_cat + "&max_id=" + max_id;
+
+ console.log(catchup_query);
notify_progress("Loading, please wait...", true);
exception_error("catchupFeed", e);
}
}
+
+function decrementFeedCounter(feed, is_cat) {
+ try {
+ var ctr = getFeedUnread(feed, is_cat);
+
+ if (ctr > 0) {
+ setFeedUnread(feed, is_cat, ctr - 1);
+ global_unread = global_unread - 1;
+ updateTitle();
+
+ if (!is_cat) {
+ var cat = parseInt(getFeedCategory(feed));
+
+ if (!isNaN(cat)) {
+ ctr = getFeedUnread(cat, true);
+
+ if (ctr > 0) {
+ setFeedUnread(cat, true, ctr - 1);
+ }
+ }
+ }
+ }
+
+ } catch (e) {
+ exception_error("decrement_feed_counter", e);
+ }
+}
+
+
git.wh0rd.org / tt-rss.git / blobdiff