From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 11 Mar 2014 09:59:14 +0000 (+0400)
Subject: add a less intimidating error message when backend times out and/or fails to return... 
X-Git-Tag: 1.12~18
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2ffe7a3b14caeb55a6338d769255cafa6f67d3c6;p=tt-rss.git

add a less intimidating error message when backend times out and/or fails to return valid JSON
---

diff --git a/js/functions.js b/js/functions.js
index 1ad15fcc..93b03715 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -833,7 +833,7 @@ function quickAddFeed() {
 									var reply = JSON.parse(transport.responseText);
 								} catch (e) {
 									Element.hide("feed_add_spinner");
-									alert(__("Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."));
+									alert(__("Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to the browser console."));
 									console.log('quickAddFeed, backend returned:' + transport.responseText);
 									return;
 								}
diff --git a/js/tt-rss.js b/js/tt-rss.js
index bb23169e..3b779355 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -987,7 +987,12 @@ function newVersionDlg() {
 
 function handle_rpc_json(transport, scheduled_call) {
 	try {
-		var reply = JSON.parse(transport.responseText);
+		try {
+			var reply = JSON.parse(transport.responseText);
+		} catch (e) {
+			alert(__("Failed to parse server reply. This could be caused by a server or network timeout. Backend output was logged to the browser console."));
+			console.log("handle_rpc_json, received: " + transport.responseText);
+		}
 
 		if (reply) {