From 2ffe7a3b14caeb55a6338d769255cafa6f67d3c6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 11 Mar 2014 13:59:14 +0400
Subject: add a less intimidating error message when backend times out and/or
 fails to return valid JSON

---
 js/tt-rss.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'js/tt-rss.js')

diff --git a/js/tt-rss.js b/js/tt-rss.js
index bb23169ec..3b7793553 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) {
 
-- 
cgit v1.2.3