valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This reverts commit 2ffe7a3b14.
This commit is contained in:
Andrew Dolgov 2014-03-11 19:09:33 +04:00
parent 2ffe7a3b14
commit 5c812c2ea4
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/functions.js
View File

@ -833,7 +833,7 @@ function quickAddFeed() {
var reply = JSON.parse(transport.responseText); var reply = JSON.parse(transport.responseText);
} catch (e) { } catch (e) {
Element.hide("feed_add_spinner"); 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); console.log('quickAddFeed, backend returned:' + transport.responseText);
return; return;
} }

7
js/tt-rss.js
View File

@ -987,12 +987,7 @@ function newVersionDlg() {
function handle_rpc_json(transport, scheduled_call) { function handle_rpc_json(transport, scheduled_call) {
try { try {
try { var reply = JSON.parse(transport.responseText);
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) { if (reply) {