summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-02-09 23:04:34 +0300
committerAndrew Dolgov <[email protected]>2017-02-09 23:04:34 +0300
commit3188e863b399446563c4952309f818c61bcfc079 (patch)
tree99762f29a3821f0f5d2ba83ea342ad6e86a106b9
parent829d478f1b054c8ce1eeb4f15170dc4a1abb3e47 (diff)
handle_rpc_json: fix netalert button never appearing on JSON parse error
-rw-r--r--index.php3
-rw-r--r--js/tt-rss.js18
2 files changed, 10 insertions, 11 deletions
diff --git a/index.php b/index.php
index 6e81bd619..e4cad9d00 100644
--- a/index.php
+++ b/index.php
@@ -232,8 +232,7 @@
<button id="net-alert" dojoType="dijit.form.Button" style="display : none" disabled="true"
title="<?php echo __("Communication problem with server.") ?>">
- <img
- src="images/error.png" />
+ <img src="images/error.png" />
</button>
<div dojoType="dijit.form.DropDownButton">
diff --git a/js/tt-rss.js b/js/tt-rss.js
index 36be92f4e..4ed89d4b2 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -994,14 +994,14 @@ function reverseHeadlineOrder() {
}
function handle_rpc_json(transport, scheduled_call) {
- try {
- var reply = JSON.parse(transport.responseText);
- var netalert_dijit = dijit.byId("net-alert");
- var netalert = false;
+ var netalert_dijit = dijit.byId("net-alert");
+ var netalert = false;
+
+ if (netalert_dijit) netalert = netalert_dijit.domNode;
- if (netalert_dijit)
- netalert = netalert_dijit.domNode;
+ try {
+ var reply = JSON.parse(transport.responseText);
if (reply) {
@@ -1049,18 +1049,18 @@ function handle_rpc_json(transport, scheduled_call) {
if (runtime_info)
parse_runtime_info(runtime_info);
- if (netalert) Element.hide(netalert);
+ if (netalert) netalert.hide();
} else {
if (netalert)
- Element.show(netalert);
+ netalert.show();
else
notify_error("Communication problem with server.");
}
} catch (e) {
if (netalert)
- Element.show(netalert);
+ netalert.show();
else
notify_error("Communication problem with server.");