X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=feedlist.js;h=8860424b1947a863ceeca12a149a8a56f2abe30c;hb=6361fd20fd89ba4bbda585066550b16a058eed43;hp=c756f14436331203fd0fbb0a092b484f581ece8a;hpb=ea003fc2cdce998e897ea5a4bc23526a7a12af3d;p=tt-rss.git
diff --git a/feedlist.js b/feedlist.js
index c756f144..8860424b 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -8,6 +8,7 @@ var mouse_y = 0;
var mouse_x = 0;
var resize_enabled = false;
+var selection_disabled = false;
var counters_last_request = 0;
function toggle_sortable_feedlist(enabled) {
@@ -25,17 +26,29 @@ function toggle_sortable_feedlist(enabled) {
}
function viewCategory(cat) {
- active_feed_is_cat = true;
viewfeed(cat, '', true);
return false;
}
-function feedlist_callback2(transport) {
+function render_feedlist(data) {
try {
- debug("feedlist_callback2");
- var f = document.getElementById("feeds-frame");
- f.innerHTML = transport.responseText;
+
+ var f = $("feeds-frame");
+ f.innerHTML = data;
+// cache_invalidate("FEEDLIST");
+// cache_inject("FEEDLIST", data, getInitParam("num_feeds"));
feedlist_init();
+
+ } catch (e) {
+ exception_error("render_feedlist", e);
+ }
+}
+
+function feedlist_callback2(transport) {
+ try {
+ console.log("feedlist_callback2");
+ if (!transport_error_check(transport)) return;
+ render_feedlist(transport.responseText);
} catch (e) {
exception_error("feedlist_callback2", e);
}
@@ -45,23 +58,27 @@ function viewNextFeedPage() {
try {
//if (!getActiveFeedId()) return;
- debug("viewNextFeedPage: calling viewfeed(), p: " + _feed_cur_page+1);
+ console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
viewfeed(getActiveFeedId(), undefined, activeFeedIsCat(), undefined,
- undefined, _feed_cur_page+1);
+ undefined, parseInt(_feed_cur_page+1));
} catch (e) {
exception_error("viewNextFeedPage", e);
}
}
+
function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
try {
+ if (offline_mode) return viewfeed_offline(feed, subop, is_cat, subop_param,
+ skip_history, offset);
+
// if (!offset) page_offset = 0;
last_requested_article = 0;
- counters_last_request = 0;
+ //counters_last_request = 0;
if (feed == getActiveFeedId()) {
cache_invalidate("F:" + feed);
@@ -95,10 +112,10 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
var date = new Date();
var timestamp = Math.round(date.getTime() / 1000);
- debug("" + _infscroll_request_sent + " : " + timestamp + "");
+ console.log("" + _infscroll_request_sent + " : " + timestamp + "");
if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
- debug("infscroll request in progress, aborting");
+ console.log("infscroll request in progress, aborting");
return;
}
@@ -106,7 +123,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
}
enableHotkeys();
-
+ hideAuxDlg();
closeInfoBox();
Form.enable("main_toolbar_form");
@@ -121,27 +138,30 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
toolbar_form.query.value = "";
}
- var query = "backend.php?op=viewfeed&feed=" + feed + "&" +
+ var query = "?op=viewfeed&feed=" + feed + "&" +
toolbar_query + "&subop=" + param_escape(subop);
- if (document.getElementById("search_form")) {
+ if ($("search_form")) {
var search_query = Form.serialize("search_form");
query = query + "&" + search_query;
+ $("search_form").query.value = "";
closeInfoBox(true);
force_nocache = true;
}
-// debug("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
+// console.log("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
if (subop == "MarkAllRead") {
+ catchup_local_feed(feed, is_cat);
+
var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
if (show_next_feed) {
if (!activeFeedIsCat()) {
- var feedlist = document.getElementById('feedList');
+ var feedlist = $('feedList');
var next_unread_feed = getRelativeFeedId(feedlist,
feed, "next", true);
@@ -186,11 +206,6 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
}
}
- var date = new Date();
- var timestamp = Math.round(date.getTime() / 1000);
- query = query + "&ts=" + timestamp
-
- disableContainerChildren("headlinesToolbar", false);
Form.enable("main_toolbar_form");
// for piggybacked counters
@@ -205,9 +220,9 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
query = query + "&csync=true";
}
- debug(query);
+ console.log(query);
- var container = document.getElementById("headlinesInnerContainer");
+ var container = $("headlinesInnerContainer");
/* if (container && page_offset == 0 && !isCdmMode()) {
new Effect.Fade(container, {duration: 1, to: 0.01,
@@ -231,22 +246,23 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
}
cache_check = cache_check_param(cache_prefix + feed, unread_ctr);
- debug("headline cache check: " + cache_check);
+ console.log("headline cache check: " + cache_check);
}
if (cache_check) {
- var f = document.getElementById("headlines-frame");
+ var f = $("headlines-frame");
clean_feed_selections();
- setActiveFeedId(feed);
+ setActiveFeedId(feed, is_cat);
- if (is_cat != undefined) {
- active_feed_is_cat = is_cat;
- }
-
if (!is_cat) {
- var feedr = document.getElementById("FEEDR-" + feed);
+ var feedr = $("FEEDR-" + feed);
+ if (feedr && !feedr.className.match("Selected")) {
+ feedr.className = feedr.className + "Selected";
+ }
+ } else {
+ var feedr = $("FCAT-" + feed_id);
if (feedr && !feedr.className.match("Selected")) {
feedr.className = feedr.className + "Selected";
}
@@ -255,16 +271,49 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
f.innerHTML = cache_find_param(cache_prefix + feed, unread_ctr);
request_counters();
+ remove_splash();
} else {
if (!page_offset) {
- notify_progress("Loading, please wait...", true);
+ var feedr;
+
+ if (is_cat) {
+ feedr = $('FCAP-' + feed);
+ } else {
+ feedr = $('FEEDR-' + feed);
+ }
+
+ if (feedr && !$('FLL-' + feed)) {
+
+ var img = $('FIMG-' + feed);
+
+ if (!is_cat && img) {
+
+ if (!img.src.match("indicator_white")) {
+ img.alt = img.src;
+ img.src = getInitParam("sign_progress");
+ }
+
+ } else {
+
+ if (!$('FLL-' + feed)) {
+ var ll = document.createElement('img');
+
+ ll.src = getInitParam("sign_progress_tiny");
+ ll.className = 'hlLoading';
+ ll.id = 'FLL-' + feed;
+
+ feedr.appendChild(ll);
+ }
+ }
+ }
}
- new Ajax.Request(query, {
+ new Ajax.Request("backend.php", {
+ parameters: query,
onComplete: function(transport) {
- headlines_callback2(transport, feed, is_cat, page_offset);
+ headlines_callback2(transport, page_offset);
} });
}
@@ -280,7 +329,7 @@ function toggleCollapseCat_af(effect) {
var elem = effect.element;
var cat = elem.id.replace("FCATLIST-", "");
- var cap = document.getElementById("FCAP-" + cat);
+ var cap = $("FCAP-" + cat);
if (Element.visible(elem)) {
cap.innerHTML = cap.innerHTML.replace("â¦", "");
@@ -298,54 +347,18 @@ function toggleCollapseCat_af(effect) {
function toggleCollapseCat(cat) {
try {
- var cat_elem = document.getElementById("FCAT-" + cat);
- var cat_list = document.getElementById("FCATLIST-" + cat).parentNode;
- var caption = document.getElementById("FCAP-" + cat);
+ var cat_elem = $("FCAT-" + cat);
+ var cat_list = $("FCATLIST-" + cat).parentNode;
+ var caption = $("FCAP-" + cat);
-/* if (cat_list.className.match("invisible")) {
- cat_list.className = "";
- caption.innerHTML = caption.innerHTML.replace("...", "");
- if (cat == 0) {
- setCookie("ttrss_vf_uclps", "0");
- }
- } else {
- cat_list.className = "invisible";
- caption.innerHTML = caption.innerHTML + "...";
- if (cat == 0) {
- setCookie("ttrss_vf_uclps", "1");
- }
-
- } */
-
- if (cat == 0) {
- if (Element.visible("FCATLIST-" + cat)) {
- setCookie("ttrss_vf_uclps", "1");
- } else {
- setCookie("ttrss_vf_uclps", "0");
- }
- }
-
- if (cat == -2) {
- if (Element.visible("FCATLIST-" + cat)) {
- setCookie("ttrss_vf_lclps", "1");
- } else {
- setCookie("ttrss_vf_lclps", "0");
- }
- }
-
- if (cat == -1) {
- if (Element.visible("FCATLIST-" + cat)) {
- setCookie("ttrss_vf_vclps", "1");
- } else {
- setCookie("ttrss_vf_vclps", "0");
- }
- }
-
Effect.toggle('FCATLIST-' + cat, 'blind', { duration: 0.5,
afterFinish: toggleCollapseCat_af });
- new Ajax.Request("backend.php?op=feeds&subop=collapse&cid=" +
- param_escape(cat));
+ new Ajax.Request("backend.php",
+ { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
+ param_escape(cat) } );
+
+ local_collapse_cat(cat);
} catch (e) {
exception_error("toggleCollapseCat", e);
@@ -354,7 +367,7 @@ function toggleCollapseCat(cat) {
function feedlist_dragsorted(ctr) {
try {
- var elem = document.getElementById("feedList");
+ var elem = $("feedList");
var cats = elem.getElementsByTagName("LI");
var ordered_cats = new Array();
@@ -367,12 +380,12 @@ function feedlist_dragsorted(ctr) {
if (ordered_cats.length > 0) {
- var query = "backend.php?op=feeds&subop=catsort&corder=" +
+ var query = "?op=feeds&subop=catsort&corder=" +
param_escape(ordered_cats.toString());
- debug(query);
+ console.log(query);
- new Ajax.Request(query);
+ new Ajax.Request("backend.php", { parameters: query });
}
} catch (e) {
@@ -382,26 +395,26 @@ function feedlist_dragsorted(ctr) {
function feedlist_init() {
try {
-// if (arguments.callee.done) return;
-// arguments.callee.done = true;
-
loading_set_progress(90);
- debug("in feedlist init");
+ console.log("in feedlist init");
hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
document.onkeydown = hotkey_handler;
document.onmousemove = mouse_move_handler;
document.onmousedown = mouse_down_handler;
document.onmouseup = mouse_up_handler;
- setTimeout("timeout()", 0);
+
+ if (!offline_mode) setTimeout("timeout()", 1);
+
+ setTimeout("hotkey_prefix_timeout()", 5*1000);
if (typeof correctPNG != 'undefined') {
correctPNG();
}
if (getActiveFeedId()) {
- //debug("some feed is open on feedlist refresh, reloading");
+ //console.log("some feed is open on feedlist refresh, reloading");
//setTimeout("viewCurrentFeed()", 100);
} else {
if (getInitParam("cdm_auto_catchup") != 1 && get_feed_unread(-3) > 0) {
@@ -412,7 +425,8 @@ function feedlist_init() {
}
}
- if (getInitParam("theme") == "") {
+ if (getInitParam("theme") == "" ||
+ getInitParam("theme_options").match("hide_footer")) {
setTimeout("hide_footer()", 5000);
}
@@ -427,19 +441,19 @@ function feedlist_init() {
function hide_footer_af(effect) {
try {
- var c = document.getElementById("content-frame");
+ var c = $("content-frame");
if (c) {
c.style.bottom = "0px";
- var ioa = document.getElementById("inline_orig_article");
+ var ioa = $("inline_orig_article");
if (ioa) {
ioa.height = c.offsetHeight;
}
} else {
- var h = document.getElementById("headlines-frame");
+ var h = $("headlines-frame");
if (h) {
h.style.bottom = "0px";
@@ -461,56 +475,20 @@ function hide_footer() {
}
}
-/*
-function init_hidden_feedlist(theme) {
+function init_collapsable_feedlist() {
try {
- debug("init_hidden_feedlist");
+ console.log("init_collapsable_feedlist");
- if (theme != "" && theme != "compact") return;
+ var theme = getInitParam("theme");
+ var options = getInitParam("theme_options");
- var fl = document.getElementById("feeds-holder");
- var fh = document.getElementById("headlines-frame");
- var fc = document.getElementById("content-frame");
- var ft = document.getElementById("toolbar");
- var ff = document.getElementById("footer");
- var fhdr = document.getElementById("header");
+ if (theme != "" && !options.match("collapse_feedlist")) return;
- var fbtn = document.getElementById("toggle_feeds_btn");
+ var fbtn = $("collapse_feeds_btn");
if (fbtn) Element.show(fbtn);
- fl.style.top = fh.offsetTop + "px";
- fl.style.backgroundColor = "white"; //FIXME
-
- Element.hide(fl);
-
- fh.style.left = "0px";
- ft.style.left = "0px";
- if (fc) fc.style.left = "0px";
- if (ff) ff.style.left = "0px";
-
- if (theme == "compact") {
- fhdr.style.left = "10px";
- fl.style.top = (fh.offsetTop + 1) + "px";
- }
-
- } catch (e) {
- exception_error("init_hidden_feedlist", e);
- }
-} */
-
-function init_collapsable_feedlist(theme) {
- try {
- debug("init_collapsable_feedlist");
-
- if (theme != "" && theme != "compact" && theme != "graycube" &&
- theme != "compat") return;
-
- var fbtn = document.getElementById("collapse_feeds_btn");
-
- if (fbtn) Element.show(fbtn);
-
- if (getCookie("ttrss_vf_fclps") == 1) {
+ if (getInitParam("collapsed_feedlist") == 1) {
collapse_feedlist();
}
@@ -551,6 +529,10 @@ function mouse_move_handler(e) {
}
}
+function enable_selection(b) {
+ selection_disabled = !b;
+}
+
function enable_resize(b) {
resize_enabled = b;
}
@@ -559,7 +541,7 @@ function mouse_down_handler(e) {
try {
/* do not prevent right click */
- if (e.button && e.button == 2) return;
+ if (e && e.button && e.button == 2) return;
if (resize_enabled) {
mouse_is_down = true;
@@ -568,17 +550,33 @@ function mouse_down_handler(e) {
document.onselectstart = function() { return false; };
return false;
}
+
+ if (selection_disabled) {
+ document.onselectstart = function() { return false; };
+ return false;
+ }
+
} catch (e) {
- exception_error("mouse_move_handler", e);
+ exception_error("mouse_down_handler", e);
}
}
function mouse_up_handler(e) {
try {
mouse_is_down = false;
- document.onselectstart = null;
+
+ if (!selection_disabled) {
+ document.onselectstart = null;
+ var e = $("headlineActionsBody");
+ if (e) Element.hide(e);
+
+ var e = $("offlineModeDrop");
+ if (e) Element.hide(e);
+
+ }
+
} catch (e) {
- exception_error("mouse_move_handler", e);
+ exception_error("mouse_up_handler", e);
}
}
@@ -586,9 +584,11 @@ function request_counters_real() {
try {
- debug("requesting counters...");
+ if (offline_mode) return;
- var query = "backend.php?op=rpc&subop=getAllCounters";
+ console.log("requesting counters...");
+
+ var query = "?op=rpc&subop=getAllCounters";
if (tagsAreDisplayed()) {
query = query + "&omode=tl";
@@ -596,7 +596,8 @@ function request_counters_real() {
query = query + "&omode=flc";
}
- new Ajax.Request(query, {
+ new Ajax.Request("backend.php", {
+ parameters: query,
onComplete: function(transport) {
try {
all_counters_callback2(transport, true);
@@ -623,19 +624,17 @@ function request_counters() {
// if (getInitParam("sync_counters") == "1" ||
// timestamp - counters_last_request > 10) {
-/* if (timestamp - counters_last_request > 10) {
-
- debug("scheduling request of counters...");
+ if (timestamp - counters_last_request > 15) {
+ console.log("scheduling request of counters...");
window.setTimeout("request_counters_real()", 1000);
counters_last_request = timestamp;
} else {
- debug("request_counters: rate limit reached: " + (timestamp - counters_last_request));
- } */
-
- window.setTimeout("request_counters_real()", 1000);
- counters_last_request = timestamp;
+ console.log("request_counters: rate limit reached: " + (timestamp - counters_last_request));
+ }
} catch (e) {
exception_error("request_counters", e);
}
}
+
+