From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Thu, 22 Nov 2007 05:05:24 +0000 (+0100)
Subject: js: add get_feed_unread()
X-Git-Tag: 1.2.18~22
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8e9dd206ef14823e0bd79662fdd02bf6b3159611;p=tt-rss.git

js: add get_feed_unread()
---

diff --git a/feedlist.js b/feedlist.js
index 272a6c15..8bbc2462 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -149,11 +149,10 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 				queue: { position:'end', scope: 'FEEDL-' + feed, limit: 1 } } );
 		}
 
-		var unread_ctr = document.getElementById("FEEDU-" + feed);
+		var unread_ctr = get_feed_unread(feed);
 		var cache_check = false;
 
-		if (unread_ctr && !page_offset && !force_nocache && !subop) {
-			unread_ctr = unread_ctr.innerHTML;
+		if (unread_ctr != -1 && !page_offset && !force_nocache && !subop) {
 
 			var cache_prefix = "";
 				
diff --git a/functions.js b/functions.js
index b093398a..93c080db 100644
--- a/functions.js
+++ b/functions.js
@@ -778,6 +778,15 @@ function all_counters_callback2(transport) {
 	}
 }
 
+function get_feed_unread(id) {
+	try {
+		return parseInt(document.getElementById("FEEDU-" + id).innerHTML);	
+	} catch (e) {
+		exception_error("get_feed_unread", e, true);
+		return -1;
+	}
+}
+
 function get_feed_entry_unread(doc, elem) {
 
 	var id = elem.id.replace("FEEDR-", "");