exception handling in some code blocks

1 files changed, 94 insertions, 93 deletions

diff --git a/feedlist.js b/feedlist.js
index e8d79c6ba..499705b63 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -1,104 +1,105 @@
 
 function viewfeed(feed, skip, subop, doc) {
+	try {
 
-	if (!doc) doc = parent.document;
-
-//	p_notify("Loading headlines...");
-
-	enableHotkeys();
-
-	var searchbox = doc.getElementById("searchbox");
-
-	if (searchbox) {
-		search_query = searchbox.value;
-	} else {
-		search_query = "";
-	} 
-
-	var searchmodebox = doc.getElementById("searchmodebox");
-
-	var search_mode;
+		if (!doc) doc = parent.document;
 	
-	if (searchmodebox) {
-		search_mode = searchmodebox[searchmodebox.selectedIndex].text;
-	} else {
-		search_mode = "";
-	}
-
-	setCookie("ttrss_vf_smode", search_mode);
-
-	var viewbox = doc.getElementById("viewbox");
-
-	var view_mode;
-
-	if (viewbox) {
-		view_mode = viewbox[viewbox.selectedIndex].text;
-	} else {
-		view_mode = "All Posts";
-	}
-
-	setCookie("ttrss_vf_vmode", view_mode);
-
-	var limitbox = doc.getElementById("limitbox");
-
-	var limit;
-
-	if (limitbox) {
-		limit = limitbox[limitbox.selectedIndex].text;
-		setCookie("ttrss_vf_limit", limit);
-	} else {
-		limit = "All";
-	}
-
-//	document.getElementById("ACTFEEDID").innerHTML = feed;
-
-	setActiveFeedId(feed);
-
-	if (subop == "MarkAllRead") {
-
-		var feedr = document.getElementById("FEEDR-" + feed);
-		var feedctr = document.getElementById("FEEDCTR-" + feed);
+		enableHotkeys();
 	
-		feedctr.className = "invisible";
-
-		if (feedr.className.match("Unread")) {
-			feedr.className = feedr.className.replace("Unread", "");
+		var searchbox = doc.getElementById("searchbox");
+	
+		if (searchbox) {
+			search_query = searchbox.value;
+		} else {
+			search_query = "";
+		} 
+	
+		var searchmodebox = doc.getElementById("searchmodebox");
+	
+		var search_mode;
+		
+		if (searchmodebox) {
+			search_mode = searchmodebox[searchmodebox.selectedIndex].text;
+		} else {
+			search_mode = "";
 		}
-	}
-
-	var query = "backend.php?op=viewfeed&feed=" + param_escape(feed) +
-		"&skip=" + param_escape(skip) + "&subop=" + param_escape(subop) +
-		"&view=" + param_escape(view_mode) + "&limit=" + limit + 
-		"&smode=" + param_escape(search_mode);
-
-	if (search_query != "") {
-		query = query + "&search=" + param_escape(search_query);
-	}
 	
-	var headlines_frame = parent.frames["headlines-frame"];
-
-//	alert(headlines_frame)
-
-	headlines_frame.location.href = query + "&addheader=true";
-
-	cleanSelectedList("feedList");
-
-	var feedr = document.getElementById("FEEDR-" + feed);
-	if (feedr) {	
-		feedr.className = feedr.className + "Selected";
-	} 
+		setCookie("ttrss_vf_smode", search_mode);
 	
-	disableContainerChildren("headlinesToolbar", false, doc);
-
-/*	var btnMarkAsRead = doc.getElementById("btnMarkFeedAsRead");
-
-	if (btnMarkAsRead && !isNumeric(feed)) {
-		btnMarkAsRead.disabled = true;
-		btnMarkAsRead.className = "disabledButton";
-	} */
-
-//	notify("");
-
+		var viewbox = doc.getElementById("viewbox");
+	
+		var view_mode;
+	
+		if (viewbox) {
+			view_mode = viewbox[viewbox.selectedIndex].text;
+		} else {
+			view_mode = "All Posts";
+		}
+	
+		setCookie("ttrss_vf_vmode", view_mode);
+	
+		var limitbox = doc.getElementById("limitbox");
+	
+		var limit;
+	
+		if (limitbox) {
+			limit = limitbox[limitbox.selectedIndex].text;
+			setCookie("ttrss_vf_limit", limit);
+		} else {
+			limit = "All";
+		}
+	
+	//	document.getElementById("ACTFEEDID").innerHTML = feed;
+	
+		setActiveFeedId(feed);
+	
+		if (subop == "MarkAllRead") {
+	
+			var feedr = document.getElementById("FEEDR-" + feed);
+			var feedctr = document.getElementById("FEEDCTR-" + feed);
+		
+			feedctr.className = "invisible";
+	
+			if (feedr.className.match("Unread")) {
+				feedr.className = feedr.className.replace("Unread", "");
+			}
+		}
+	
+		var query = "backend.php?op=viewfeed&feed=" + param_escape(feed) +
+			"&skip=" + param_escape(skip) + "&subop=" + param_escape(subop) +
+			"&view=" + param_escape(view_mode) + "&limit=" + limit + 
+			"&smode=" + param_escape(search_mode);
+	
+		if (search_query != "") {
+			query = query + "&search=" + param_escape(search_query);
+		}
+		
+		var headlines_frame = parent.frames["headlines-frame"];
+	
+	//	alert(headlines_frame)
+	
+		headlines_frame.location.href = query + "&addheader=true";
+	
+		cleanSelectedList("feedList");
+	
+		var feedr = document.getElementById("FEEDR-" + feed);
+		if (feedr) {	
+			feedr.className = feedr.className + "Selected";
+		} 
+		
+		disableContainerChildren("headlinesToolbar", false, doc);
+	
+	/*	var btnMarkAsRead = doc.getElementById("btnMarkFeedAsRead");
+	
+		if (btnMarkAsRead && !isNumeric(feed)) {
+			btnMarkAsRead.disabled = true;
+			btnMarkAsRead.className = "disabledButton";
+		} */
+	
+	//	notify("");
+	} catch (e) {
+		exception_error("viewfeed", e);
+	}		
 }
 
 function localHotkeyHandler(keycode) {