From 867413478a0f18754c87a9998277e6d6d58abe08 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Thu, 8 Sep 2005 06:29:45 +0100
Subject: [PATCH] remove ACTFEEDID container, keep information in a cookie
 instead (getActiveFeedId/setActiveFeedId API)

---
 backend.php  |  2 +-
 feedlist.js  |  9 ++-------
 functions.js |  8 ++++++++
 tt-rss.js    | 44 ++++++++++++++++++--------------------------
 viewfeed.js  |  7 +++----
 5 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/backend.php b/backend.php
index 27ccf4c3..e9be9450 100644
--- a/backend.php
+++ b/backend.php
@@ -117,7 +117,7 @@
 		print "</table>";
 
 		print "<div class=\"invisible\" id=\"FEEDTU\">$total_unread</div>";
-		print "<div class=\"invisible\" id=\"ACTFEEDID\">$actid</div>";
+//		print "<div class=\"invisible\" id=\"ACTFEEDID\">$actid</div>";
 
 	}
 
diff --git a/feedlist.js b/feedlist.js
index b5b34bfc..2e6497a1 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -1,5 +1,3 @@
-var active_feed_id = 666;
-var active_offset;
 
 function viewfeed(feed, skip, subop, doc) {
 
@@ -40,12 +38,9 @@ function viewfeed(feed, skip, subop, doc) {
 		limit = "All";
 	}
 
-	active_feed_id = feed;
-	active_offset = skip;
+//	document.getElementById("ACTFEEDID").innerHTML = feed;
 
-	document.getElementById("ACTFEEDID").innerHTML = feed;
-
-	setCookie("ttrss_vf_actfeed", feed);
+	setActiveFeedId(feed);
 
 	if (subop == "MarkAllRead") {
 
diff --git a/functions.js b/functions.js
index 5f8b2425..4e758a7d 100644
--- a/functions.js
+++ b/functions.js
@@ -270,3 +270,11 @@ function gotoMain() {
 function gotoExportOpml() {
 	document.location.href = "opml.php?op=Export";
 }
+
+function getActiveFeedId() {
+	return getCookie("ttrss_vf_actfeed");
+}
+
+function setActiveFeedId(id) {
+	return setCookie("ttrss_vf_actfeed", id);
+}
diff --git a/tt-rss.js b/tt-rss.js
index 234fb363..edfd1069 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -8,8 +8,6 @@ var xmlhttp = false;
 var total_unread = 0;
 var first_run = true;
 
-var active_feed_id = false;
-
 var search_query = "";
 
 /*@cc_on @*/
@@ -50,15 +48,6 @@ function feedlist_callback() {
 }
 */
 
-function checkActiveFeedId() {
-
-	var actfeedid = frames["feeds-frame"].document.getElementById("ACTFEEDID");
-
-	if (actfeedid) {
-		active_feed_id = actfeedid.innerHTML;
-	}
-}
-
 function refetch_callback() {
 
 	if (xmlhttp.readyState == 4) {
@@ -117,8 +106,8 @@ function updateFeedList(silent, fetch) {
 
 	var query_str = "backend.php?op=feeds";
 
-	if (active_feed_id) {
-		query_str = query_str + "&actid=" + active_feed_id;
+	if (getActiveFeedId()) {
+		query_str = query_str + "&actid=" + getActiveFeedId();
 	}
 
 	if (fetch) query_str = query_str + "&fetch=yes";
@@ -142,10 +131,8 @@ function catchupAllFeeds() {
 
 function viewCurrentFeed(skip, subop) {
 
-	active_feed_id = frames["feeds-frame"].document.getElementById("ACTFEEDID").innerHTML;
-
-	if (active_feed_id) {
-		viewfeed(active_feed_id, skip, subop);
+	if (getActiveFeedId()) {
+		viewfeed(getActiveFeedId(), skip, subop);
 	}
 }
 
@@ -186,13 +173,11 @@ function viewfeed(feed, skip, subop) {
 		limit = "All";
 	}
 
-	active_feed_id = feed;
+	setActiveFeedId(feed);
 
 	var f_doc = frames["feeds-frame"].document;
 
-	f_doc.getElementById("ACTFEEDID").innerHTML = feed;
-
-	setCookie("ttrss_vf_actfeed", feed);
+//	f_doc.getElementById("ACTFEEDID").innerHTML = feed;
 
 	if (subop == "MarkAllRead") {
 
@@ -239,16 +224,16 @@ function timeout() {
 function resetSearch() {
 	var searchbox = document.getElementById("searchbox")
 
-	if (searchbox.value != "" && active_feed_id) {	
+	if (searchbox.value != "" && getActiveFeedId()) {	
 		searchbox.value = "";
-		viewfeed(active_feed_id, 0, "");
+		viewfeed(getActiveFeedId(), 0, "");
 	}
 }
 
 function search() {
 	checkActiveFeedId();
-	if (active_feed_id) {
-		viewfeed(active_feed_id, 0, "");
+	if (getActiveFeedId()) {
+		viewfeed(getActiveFeedId(), 0, "");
 	} else {
 		notify("Please select some feed first.");
 	}
@@ -282,7 +267,7 @@ function localHotkeyHandler(keycode) {
 	}
 
 	if (keycode == 85) {
-		return viewfeed(active_feed_id, active_offset, "ForceUpdate");
+		return viewfeed(getActiveFeedId(), 0, "ForceUpdate");
 	}
 
 //	notify("KC: " + keycode);
@@ -317,6 +302,13 @@ function init() {
 		var limitbox = document.getElementById("limitbox");
 		limitbox.value = getCookie("ttrss_vf_limit");
 	}
+
+//	if (getCookie("ttrss_vf_actfeed")) {
+//		viewfeed(getCookie("ttrss_vf_actfeed"), 0, '');
+//	}
+
+	setCookie("ttrss_vf_actfeed", "");
+
 }
 
 
diff --git a/viewfeed.js b/viewfeed.js
index b45bce98..35bef67b 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -1,4 +1,3 @@
-var active_feed_id = false;
 var active_post_id = false;
 var total_unread = 0;
 
@@ -73,7 +72,7 @@ function view(id, feed_id) {
 	}
 
 	active_post_id = id; 
-	active_feed_id = feed_id;
+	setActiveFeedId(feed_id);
 
 	var content = parent.document.getElementById("content-frame");
 
@@ -134,13 +133,13 @@ function moveToPost(mode) {
 
 	if (mode == "next") {
 	 	if (next_id != undefined) {
-			view(next_id, active_feed_id);
+			view(next_id, getActiveFeedId());
 		}
 	}
 
 	if (mode == "prev") {
 		if ( prev_id != undefined) {
-			view(prev_id, active_feed_id);
+			view(prev_id, getActiveFeedId());
 		}
 	} 
 }
-- 
2.39.5