X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;ds=sidebyside;f=feedlist.js;h=8bbc24626ff533101f238b3495d4d9c74a8386de;hb=6823cc39448ece6577747b5a5d8ca7ca6891e96a;hp=df1e17fb6790456e75cce67c510b23a72175edb0;hpb=6b4163cb464534e827b4282f84541d86c8e19ec5;p=tt-rss.git

diff --git a/feedlist.js b/feedlist.js
index df1e17fb..8bbc2462 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -1,123 +1,255 @@
-var xmlhttp = Ajax.getTransport();
+var _feed_cur_page = 0;
+var _infscroll_disable = 0;
+var _infscroll_request_sent = 0;
 
 function viewCategory(cat) {
-	getMainContext().active_feed_is_cat = true;
+	active_feed_is_cat = true;
 	viewfeed(cat, '', true);
+	return false;
 }
 
-function feedlist_callback() {
-	if (xmlhttp.readyState == 4) {
+function feedlist_callback2(transport) {
+	try {
+		debug("feedlist_callback2");
 		var f = document.getElementById("feeds-frame");
-		f.innerHTML = xmlhttp.responseText;
+		f.innerHTML = transport.responseText;
+		feedlist_init();
+	} catch (e) {
+		exception_error("feedlist_callback2", e);
 	}
 }
 
-function viewfeed(feed, subop, is_cat, subop_param) {
+function viewNextFeedPage() {
 	try {
+		if (!getActiveFeedId()) return;
 
-		enableHotkeys();
+		viewfeed(getActiveFeedId(), undefined, undefined, undefined,
+			undefined, _feed_cur_page+1);
 
-		var toolbar_query = parent.Form.serialize("main_toolbar_form");
-		var toolbar_form = document.forms["main_toolbar_form"];
+	} catch (e) {
+		exception_error(e, "viewFeedGoPage");
+	}
+}
 
-		if (document.forms["main_toolbar_form"].query) {
-			toolbar_form.query.value = "";
+function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
+	try {
+
+//		if (!offset) page_offset = 0;
+
+		var force_nocache = false;
+
+		var page_offset = 0;
+
+		if (offset > 0) {
+			page_offset = offset;
+		} else {
+			page_offset = 0;
+			_feed_cur_page = 0;
+			_infscroll_disable = 0;
+		}
+
+		if (getActiveFeedId() != feed) {
+			_feed_cur_page = 0;
+			active_post_id = 0;
+			_infscroll_disable = 0;
 		}
 
-/*		storeInitParam("toolbar_limit", 
-			toolbar_form.limit[toolbar_form.limit.selectedIndex].value);
+		if (page_offset != 0 && !subop) {
+			var date = new Date();
+			var timestamp = Math.round(date.getTime() / 1000);
 
-		storeInitParam("toolbar_view_mode", 
-			toolbar_form.view_mode[toolbar_form.view_mode.selectedIndex].value);  */
+			debug("<b>" + _infscroll_request_sent + " : " + timestamp + "</b>");
 
-		var query = "backend.php?op=viewfeed&feed=" + feed + "&" +
-			toolbar_query + "&subop=" + param_escape(subop);
+			if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
+				debug("infscroll request in progress, aborting");
+				return;
+			}
 
-		if (parent.document.getElementById("search_form")) {
-			var search_query = parent.Form.serialize("search_form");
-			query = query + "&" + search_query;
-			parent.closeInfoBox(true);
+			_infscroll_request_sent = timestamp;			
 		}
 
-		debug("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
+		enableHotkeys();
 
-		var fe = document.getElementById("FEEDR-" + getActiveFeedId());
+		closeInfoBox();
 
-		if (fe) {
-			fe.className = fe.className.replace("Selected", "");
+		Form.enable("main_toolbar_form");
+
+		var toolbar_form = document.forms["main_toolbar_form"];
+		var toolbar_query = Form.serialize("main_toolbar_form");
+
+		if (toolbar_form.query) {
+			if (toolbar_form.query.value != "") {
+				force_nocache = true;
+			}
+			toolbar_form.query.value = "";
 		}
 
-		setActiveFeedId(feed);
-	
-		if (is_cat != undefined) {
-			getMainContext().active_feed_is_cat = is_cat;
+		var query = "backend.php?op=viewfeed&feed=" + feed + "&" +
+			toolbar_query + "&subop=" + param_escape(subop);
+
+		if (document.getElementById("search_form")) {
+			var search_query = Form.serialize("search_form");
+			query = query + "&" + search_query;
+			closeInfoBox(true);
+			force_nocache = true;
 		}
 
+//		debug("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
+
 		if (subop == "MarkAllRead") {
 
 			var feedlist = document.getElementById('feedList');
 			
 			var next_unread_feed = getRelativeFeedId(feedlist,
-					getActiveFeedId(), "next", true);
+					feed, "next", true);
+
+			if (!next_unread_feed) {
+				next_unread_feed = getRelativeFeedId(feedlist,
+					-3, "next", true);
+			}
 
-			var show_next_feed = parent.getInitParam("on_catchup_show_next_feed") == "1";
+			var show_next_feed = getInitParam("on_catchup_show_next_feed") == "1";
 
 			if (next_unread_feed && show_next_feed && !activeFeedIsCat()) {
 				query = query + "&nuf=" + param_escape(next_unread_feed);
-				setActiveFeedId(next_unread_feed);
+				//setActiveFeedId(next_unread_feed);
+				feed = next_unread_feed;
 			}
 		}
 
-		if (activeFeedIsCat()) {
+		if (is_cat) {
 			query = query + "&cat=1";
 		}
 
-		var headlines_frame = parent.frames["headlines-frame"];
-
-		if (navigator.userAgent.match("Opera")) {
-			var date = new Date();
-			var timestamp = Math.round(date.getTime() / 1000);
-			query = query + "&ts=" + timestamp
+		if (page_offset != 0) {
+			query = query + "&skip=" + page_offset;
 		}
 
-		if (!activeFeedIsCat()) {
-			var feedr = document.getElementById("FEEDR-" + getActiveFeedId());
-			if (feedr && !feedr.className.match("Selected")) {	
-				feedr.className = feedr.className + "Selected";
-			} 
-		}
+		var date = new Date();
+		var timestamp = Math.round(date.getTime() / 1000);
+		query = query + "&ts=" + timestamp
 		
 		disableContainerChildren("headlinesToolbar", false);
 		Form.enable("main_toolbar_form");
 
 		debug(query);
 
-		if (xmlhttp_ready(xmlhttp)) {
-			xmlhttp.open("GET", query, true);
-			xmlhttp.onreadystatechange=headlines_callback;
-			xmlhttp.send(null);
+		// for piggybacked counters
+
+		if (tagsAreDisplayed()) {
+			query = query + "&omode=lt";
 		} else {
-			debug("xmlhttp busy (@feeds)");
-		}  
+			query = query + "&omode=flc";
+		}
+
+		var container = document.getElementById("headlinesInnerContainer");
+
+		if (container && page_offset == 0 && !isCdmMode()) {
+			new Effect.Fade(container, {duration: 1, to: 0.01,
+				queue: { position:'end', scope: 'FEEDL-' + feed, limit: 1 } } );
+		}
+
+		var unread_ctr = get_feed_unread(feed);
+		var cache_check = false;
+
+		if (unread_ctr != -1 && !page_offset && !force_nocache && !subop) {
+
+			var cache_prefix = "";
+				
+			if (is_cat) {
+				cache_prefix = "C:";
+			} else {
+				cache_prefix = "F:";
+			}
+
+			cache_check = cache_check_param(cache_prefix + feed, unread_ctr);
+			debug("headline cache check: " + cache_check);
+		}
+
+		if (cache_check) {
+			var f = document.getElementById("headlines-frame");
+
+			clean_feed_selections();
+
+			setActiveFeedId(feed);
+		
+			if (is_cat != undefined) {
+				active_feed_is_cat = is_cat;
+			}
+	
+			if (!is_cat) {
+				var feedr = document.getElementById("FEEDR-" + feed);
+				if (feedr && !feedr.className.match("Selected")) {	
+					feedr.className = feedr.className + "Selected";
+				} 
+			}
 
+			f.innerHTML = cache_find_param(cache_prefix + feed, unread_ctr);
+
+			var query = "backend.php?op=rpc&subop=getAllCounters";
+
+			if (tagsAreDisplayed()) {
+				query = query + "&omode=tl";
+			} else {
+				query = query + "&omode=flc";
+			}
+
+			new Ajax.Request(query, {
+				onComplete: function(transport) { 
+					try {
+						all_counters_callback2(transport);
+					} catch (e) {
+						exception_error("viewfeed/getcounters", e);
+					}
+				} });
+
+		} else {
+
+			if (!page_offset) {
+				notify_progress("Loading, please wait...", true);
+			}
+
+			new Ajax.Request(query, {
+				onComplete: function(transport) { 
+					headlines_callback2(transport, feed, is_cat, page_offset); 
+				} });
+		}
 
 	} catch (e) {
 		exception_error("viewfeed", e);
 	}		
 }
 
-function toggleCollapseCat(cat) {
+function toggleCollapseCat_af(effect) {
+	//var caption = elem.id.replace("FCATLIST-", "");
+
 	try {
-		if (!xmlhttp_ready(xmlhttp)) {
-			printLockingError();
-			return;
+
+		var elem = effect.element;
+		var cat = elem.id.replace("FCATLIST-", "");
+		var cap = document.getElementById("FCAP-" + cat);
+
+		if (Element.visible(elem)) {
+			cap.innerHTML = cap.innerHTML.replace("…", "");
+		} else {
+			if (cap.innerHTML.lastIndexOf("…") != cap.innerHTML.length-3) {
+				cap.innerHTML = cap.innerHTML + "…";
+			}
 		}
+
+	} catch (e) {
+		exception_error("toggleCollapseCat_af", e);
+	}
+}
+
+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);
 		
-		if (cat_list.className.match("invisible")) {
+/*		if (cat_list.className.match("invisible")) {
 			cat_list.className = "";
 			caption.innerHTML = caption.innerHTML.replace("...", "");
 			if (cat == 0) {
@@ -128,8 +260,36 @@ function toggleCollapseCat(cat) {
 			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));
@@ -141,25 +301,71 @@ function toggleCollapseCat(cat) {
 
 function feedlist_init() {
 	try {
-		if (arguments.callee.done) return;
-		arguments.callee.done = true;		
+//		if (arguments.callee.done) return;
+//		arguments.callee.done = true;		
 		
-		parent.debug("in feedlist init");
+		debug("in feedlist init");
 		
 		hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1);
 		document.onkeydown = hotkey_handler;
-		parent.setTimeout("timeout()", 0);
+		setTimeout("timeout()", 0);
 
-		parent.debug("about to remove splash, OMG!");
+		debug("about to remove splash, OMG!");
 
-		var o = parent.document.getElementById("overlay");
+		var o = document.getElementById("overlay");
 
 		if (o) {
 			o.style.display = "none";
-			parent.debug("removed splash!");
+			debug("removed splash!");
+		}
+
+		if (typeof correctPNG != 'undefined') {
+			correctPNG();
+		}
+
+		if (getActiveFeedId()) {
+			debug("some feed is open on feedlist refresh, reloading");
+			setTimeout("viewCurrentFeed()", 100);
+		} else {
+			if (getInitParam("cdm_auto_catchup") != 1) {				
+				setTimeout("viewfeed(-3)", 100);
+			}
+		}
+
+		if (getInitParam("theme") == "") {
+			setTimeout("hide_footer()", 5000);
 		}
 
 	} catch (e) {
 		exception_error("feedlist/init", e);
 	}
 }
+
+function hide_footer_af(effect) {
+	try {
+		var c = document.getElementById("content-frame");
+
+		if (c) {
+			c.style.bottom = "0px";
+		} else {
+			var h = document.getElementById("headlines-frame");
+
+			if (h) {
+				h.style.bottom = "0px";
+			}
+		}
+
+	} catch (e) {
+		exception_error("hide_footer_af", e);
+	}
+}
+
+function hide_footer() {
+	try {
+		if (Element.visible("footer")) {
+			new Effect.Fade("footer", { afterFinish: hide_footer_af });
+		}
+	} catch (e) {
+		exception_error("hide_footer", e);
+	}
+}