var _feed_cur_page = 0;
var _infscroll_disable = 0;
var _infscroll_request_sent = 0;
+var _search_query = false;
var counter_timeout_id = false;
function viewfeed(feed, subop, is_cat, offset) {
try {
if (is_cat == undefined) is_cat = false;
+ if (subop == undefined) subop = '';
// if (!offset) page_offset = 0;
/* if (getInitParam("theme") == "" || getInitParam("theme") == "compact") {
if (getInitParam("hide_feedlist") == 1) {
Element.hide("feeds-holder");
- }
+ }
} */
dijit.byId("content-tabs").selectChild(
return;
}
- _infscroll_request_sent = timestamp;
+ _infscroll_request_sent = timestamp;
}
- enableHotkeys();
hideAuxDlg();
- closeInfoBox();
Form.enable("main_toolbar_form");
var query = "?op=viewfeed&feed=" + feed + "&" +
toolbar_query + "&subop=" + param_escape(subop);
- if ($("search_form")) {
- var search_query = Form.serialize("search_form");
- query = query + "&" + search_query;
- $("search_form").query.value = "";
- closeInfoBox(true);
+ if (_search_query) {
force_nocache = true;
+ query = query + "&" + _search_query;
+ _search_query = false;
}
// console.log("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
if (show_next_feed) {
- // TODO: implement show_next_feed handling
+ var tree = dijit.byId("feedTree");
+ var nuf = tree.model.getNextUnreadFeed(feed, is_cat);
+
+ if (nuf) {
+ var nuf_id = tree.model.store.getValue(nuf, 'bare_id');
+
+ query = query + "&nuf=" + param_escape(nuf_id);
+ }
}
}
console.log(query);
- var unread_ctr = -1;
-
+/* var unread_ctr = -1;
+
if (!is_cat) unread_ctr = getFeedUnread(feed);
var cache_check = false;
if (unread_ctr != -1 && !page_offset && !force_nocache && !subop) {
var cache_prefix = "";
-
+
if (is_cat) {
cache_prefix = "C:";
} else {
if (cache_check) {
setActiveFeedId(feed, is_cat);
-
- $("headlines-frame").innerHTML = cache_find_param(cache_prefix + feed,
+
+ $("headlines-frame").innerHTML = cache_find_param(cache_prefix + feed,
unread_ctr);
request_counters();
remove_splash();
- } else {
+ } else { */
if (!is_cat) {
if (!setFeedExpandoIcon(feed, is_cat, 'images/indicator_white.gif'))
new Ajax.Request("backend.php", {
parameters: query,
- onComplete: function(transport) {
+ onComplete: function(transport) {
setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
- headlines_callback2(transport, page_offset);
+ headlines_callback2(transport, page_offset);
} });
- }
+// }
} catch (e) {
exception_error("viewfeed", e);
- }
+ }
}
function feedlist_init() {
try {
console.log("in feedlist init");
-
+
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
document.onkeydown = hotkey_handler;
setTimeout("hotkey_prefix_timeout()", 5*1000);
if (!getActiveFeedId()) {
- if (getInitParam("cdm_auto_catchup") != 1) {
- setTimeout("viewfeed(-3)", 100);
- } else {
- setTimeout("viewfeed(-5)", 100);
- }
- }
+ setTimeout("viewfeed(-3)", 100);
+ }
- console.log("T:" +
+ console.log("T:" +
getInitParam("cdm_auto_catchup") + " " + getFeedUnread(-3));
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+ setTimeout("timeout()", 5000);
+
} catch (e) {
exception_error("feedlist/init", e);
}
new Ajax.Request("backend.php", {
parameters: query,
- onComplete: function(transport) {
+ onComplete: function(transport) {
try {
- handle_rpc_reply(transport);
+ handle_rpc_json(transport);
} catch (e) {
exception_error("viewfeed/getcounters", e);
}
}
}
-function parse_counters(reply, scheduled_call) {
+function parse_counters(elems, scheduled_call) {
try {
var feeds_found = 0;
- var elems = JSON.parse(reply.firstChild.nodeValue);
-
for (var l = 0; l < elems.length; l++) {
var id = elems[l].id
var has_img = elems[l].has_img;
var updated = elems[l].updated;
var title = elems[l].title;
-
+
if (id == "global-unread") {
global_unread = ctr;
updateTitle();
// TODO: enable new content notification for categories
- if (!activeFeedIsCat() && id == getActiveFeedId()
+ if (!activeFeedIsCat() && id == getActiveFeedId()
&& ctr > getFeedUnread(id) && scheduled_call) {
displayNewContentPrompt(id);
}
setFeedUnread(id, (kind == "cat"), ctr);
if (kind != "cat") {
- //setFeedValue(id, false, 'error', error);
+ setFeedValue(id, false, 'error', error);
setFeedValue(id, false, 'updated', updated);
if (id > 0) {
if (has_img) {
- setFeedIcon(id, false,
+ setFeedIcon(id, false,
getInitParam("icons_url") + "/" + id + ".ico");
} else {
setFeedIcon(id, false, 'images/blank_icon.gif');
}
}
}
-
- hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
- var feeds_stored = number_of_feeds;
-
- if (feeds_stored != feeds_found) {
- number_of_feeds = feeds_found;
-
- if (feeds_stored != 0 && feeds_found != 0) {
- console.log("Subscribed feed number changed, refreshing feedlist");
- setTimeout('updateFeedList()', 50);
- }
- }
+ hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
} catch (e) {
exception_error("parse_counters", e);
try {
var tree = dijit.byId("feedTree");
- if (tree && tree.model)
+ if (tree && tree.model)
return tree.model.getFeedUnread(feed, is_cat);
} catch (e) {
return tree.hideRead(hide, getInitParam("hide_read_shows_special"));
}
-function getFeedName(feed, is_cat) {
+function getFeedName(feed, is_cat) {
var tree = dijit.byId("feedTree");
- if (tree && tree.model)
+ if (tree && tree.model)
return tree.model.getFeedValue(feed, is_cat, 'name');
}
-function getFeedValue(feed, is_cat, key) {
+function getFeedValue(feed, is_cat, key) {
try {
var tree = dijit.byId("feedTree");
- if (tree && tree.model)
+ if (tree && tree.model)
return tree.model.getFeedValue(feed, is_cat, key);
-
+
} catch (e) {
//
}
try {
var tree = dijit.byId("feedTree");
- if (tree && tree.model)
+ if (tree && tree.model)
return tree.model.setFeedUnread(feed, is_cat, unread);
} catch (e) {
try {
var tree = dijit.byId("feedTree");
- if (tree && tree.model)
+ if (tree && tree.model)
return tree.model.setFeedValue(feed, is_cat, key, value);
} catch (e) {
git.wh0rd.org / tt-rss.git / blobdiff