add a less intimidating error message when backend times out and/or fails to return...

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

diff --git a/js/tt-rss.js b/js/tt-rss.js
index b5bbd9f57b2511096ba2dfb433c4a6e9552ce8f5..3b7793553a94b13dcb8a659f86717d1fe0fa723c 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -550,9 +550,6 @@ function init_second_stage() {
                        updateFeedList();
                        closeArticlePanel();
 
-                       _widescreen_mode = getInitParam("widescreen");
-                       switchPanelMode(_widescreen_mode);
-
                        if (parseInt(getCookie("ttrss_fh_width")) > 0) {
                                dijit.byId("feeds-holder").domNode.setStyle(
                                        {width: getCookie("ttrss_fh_width") + "px" });
@@ -624,6 +621,9 @@ function init_second_stage() {
                hotkeys[1] = tmp;
                setInitParam("hotkeys", hotkeys);
 
+               _widescreen_mode = getInitParam("widescreen");
+               switchPanelMode(_widescreen_mode);
+
                console.log("second stage ok");
 
                if (getInitParam("simple_update")) {
@@ -892,7 +892,7 @@ function hotkey_handler(e) {
                        cmdline.innerHTML = keychar;
                        Element.show(cmdline);
 
-                       return false;
+                       return true;
                }
 
                Element.hide(cmdline);
@@ -987,7 +987,12 @@ function newVersionDlg() {
 
 function handle_rpc_json(transport, scheduled_call) {
        try {
-               var reply = JSON.parse(transport.responseText);
+               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);
+               }
 
                if (reply) {
 
@@ -1064,11 +1069,8 @@ function switchPanelMode(wide) {
 
                        dijit.byId("content-insert").domNode.setStyle({width: '50%',
                                height: 'auto',
-                               borderLeftWidth: '1px',
-                               borderLeftColor: '#c0c0c0',
                                borderTopWidth: '0px' });
 
-                       $("headlines-toolbar").setStyle({ borderBottomWidth: '0px' });
                        $("headlines-frame").setStyle({ borderBottomWidth: '0px' });
                        $("headlines-frame").addClassName("wide");
 
@@ -1078,10 +1080,7 @@ function switchPanelMode(wide) {
 
                        dijit.byId("content-insert").domNode.setStyle({width: 'auto',
                                height: '50%',
-                               borderLeftWidth: '0px',
-                               borderTopWidth: '1px'});
-
-                       $("headlines-toolbar").setStyle({ borderBottomWidth: '1px' });
+                               borderTopWidth: '0px'});
 
                        $("headlines-frame").setStyle({ borderBottomWidth: '1px' });
                        $("headlines-frame").removeClassName("wide");