Merge pull request #385 from dzaikos/cache-image-size-2

[tt-rss.git] / js / tt-rss.js

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 3b7793553a94b13dcb8a659f86717d1fe0fa723c..a66411d11d507f0e123d942756088e5e3b32789c 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -987,12 +987,13 @@ 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);
+
+               var netalert_dijit = dijit.byId("net-alert");
+               var netalert = false;
+
+               if (netalert_dijit)
+                       netalert = netalert_dijit.domNode;
 
                if (reply) {
 
@@ -1040,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);
        }