public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 18:25:55 +00:00
Code Issues Releases Wiki Activity

handle_rpc_json: do not crash if net-alert is somehow unavailable

Browse Source
This commit is contained in:
Andrew Dolgov
2014-03-14 14:05:32 +04:00
parent b55aec078c
commit df63125dd7
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
js/tt-rss.js
View File

@@ -989,6 +989,12 @@ function handle_rpc_json(transport, scheduled_call) {
try {
var reply = JSON.parse(transport.responseText);
var netalert_dijit = dijit.byId("net-alert");
var netalert = false;
if (netalert_dijit)
netalert = netalert_dijit.domNode;
if (reply) {
var error = reply['error'];
@@ -1035,16 +1041,21 @@ function handle_rpc_json(transport, scheduled_call) {
if (runtime_info)
parse_runtime_info(runtime_info);
Element.hide(dijit.byId("net-alert").domNode);
if (netalert) Element.hide(netalert);
} else {
//notify_error("Error communicating with server.");
Element.show(dijit.byId("net-alert").domNode);
if (netalert)
Element.show(netalert);
else
notify_error("Communication problem with server.");
}
} catch (e) {
Element.show(dijit.byId("net-alert").domNode);
//notify_error("Error communicating with server.");
if (netalert)
Element.show(netalert);
else
notify_error("Communication problem with server.");
console.log(e);
//exception_error("handle_rpc_json", e, transport);
}