diff options
author | Andrew Dolgov <[email protected]> | 2014-03-11 19:09:33 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-03-11 19:09:33 +0400 |
commit | 5c812c2ea4f8fb60ccceb7dbf9ec06ff9372c077 (patch) | |
tree | c0bb175eb9f0659485a5df81be8c6cf9d335cc24 | |
parent | 2ffe7a3b14caeb55a6338d769255cafa6f67d3c6 (diff) |
Revert "add a less intimidating error message when backend times out and/or fails to return valid JSON"
This reverts commit 2ffe7a3b14caeb55a6338d769255cafa6f67d3c6.
-rw-r--r-- | js/functions.js | 2 | ||||
-rw-r--r-- | js/tt-rss.js | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/js/functions.js b/js/functions.js index 93b037152..1ad15fcc6 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 the browser console.")); + alert(__("Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console.")); console.log('quickAddFeed, backend returned:' + transport.responseText); return; } diff --git a/js/tt-rss.js b/js/tt-rss.js index 3b7793553..bb23169ec 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -987,12 +987,7 @@ function newVersionDlg() { function handle_rpc_json(transport, scheduled_call) { try { - 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); - } + var reply = JSON.parse(transport.responseText); if (reply) { |