update schema, more mysql work

1 files changed, 11 insertions, 8 deletions

diff --git a/tt-rss.js b/tt-rss.js
index 2015797c5..1d1c793a9 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -58,16 +58,18 @@ function feedlist_callback() {
 }
 */
 
+function checkActiveFeedId() {
 
-function refetch_callback() {
+	var actfeedid = frames["feeds-frame"].document.getElementById("ACTFEEDID");
 
-	if (xmlhttp_rpc.readyState == 4) {
+	if (actfeedid) {
+		active_feed_id = actfeedid.innerHTML;
+	}
+}
 
-		var actfeedid = frames["feeds-frame"].document.getElementById("ACTFEEDID");
+function refetch_callback() {
 
-		if (actfeedid) {
-			active_feed_id = actfeedid.innerHTML;
-		}
+	if (xmlhttp_rpc.readyState == 4) {
 
 		document.title = "Tiny Tiny RSS";
 		notify("All feeds updated.");
@@ -253,6 +255,7 @@ function resetSearch() {
 }
 
 function search() {
+	checkActiveFeedId();
 	if (active_feed_id) {
 		viewfeed(active_feed_id, 0, "");
 	} else {
@@ -315,9 +318,9 @@ function init() {
 
 	updateFeedList(false, false);
 	document.onkeydown = hotkey_handler;
-	setTimeout("timeout()", 1800*1000);
 
-	scheduleFeedUpdate(true);
+//	setTimeout("timeout()", 1800*1000);
+//	scheduleFeedUpdate(true);
 
 	var content = document.getElementById("content");