tweak error message

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

diff --git a/tt-rss.js b/tt-rss.js
index bc5bc8205c06f36a7c9f87dd283849f35324084c..91f0b3c30ac01b1d7b27640be12194f67c77bc67 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -14,6 +14,7 @@ var cookie_lifetime = 0;
 var active_feed_id = 0;
 var active_feed_is_cat = false;
 var number_of_feeds = 0;
+var sanity_check_done = false;
 
 var xmlhttp = Ajax.getTransport();
 var xmlhttp_ctr = Ajax.getTransport();
@@ -88,7 +89,14 @@ function backend_sanity_check_callback() {
        if (xmlhttp.readyState == 4) {
 
                try {
-               
+       
+                       if (sanity_check_done) {
+                               fatalError(11, "Sanity check request received twice. This can indicate "+
+                             "presence of Firebug or some other disrupting extension. "+
+                                       "Please disable it and try again.");
+                               return;
+                       }
+
                        if (!xmlhttp.responseXML) {
                                fatalError(3, "[D001, Received reply is not XML]: " + xmlhttp.responseText);
                                return;
@@ -124,6 +132,8 @@ function backend_sanity_check_callback() {
                                }
                        }
 
+                       sanity_check_done = true;
+
                        init_second_stage();
 
                } catch (e) {
@@ -376,6 +386,19 @@ function init() {
        }
 }
 
+function resize_headlines() {
+       var h_frame = document.getElementById("headlines-frame");
+       var c_frame = document.getElementById("content-frame");
+
+       debug("resize_headlines");
+
+       if (c_frame && h_frame) {
+               h_frame.style.height = 30 + "%";
+               c_frame.style.top = h_frame.offsetTop + h_frame.offsetHeight + 1 + "px";
+               h_frame.style.height = h_frame.offsetHeight + "px";
+       }
+}
+
 function init_second_stage() {
 
        try {
@@ -384,12 +407,15 @@ function init_second_stage() {
 
                delCookie("ttrss_vf_test");
        
-               document.onkeydown = hotkey_handler;
+               if (!is_msie()) {
+                       document.onresize = resize_headlines;
+                       resize_headlines();
+               }
 
-               var tb = parent.document.forms["main_toolbar_form"];
+               var toolbar = document.forms["main_toolbar_form"];
 
-               dropboxSelect(tb.view_mode, getInitParam("toolbar_view_mode"));
-               dropboxSelect(tb.limit, getInitParam("toolbar_limit"));
+               dropboxSelect(toolbar.view_mode, getInitParam("default_view_mode"));
+               dropboxSelect(toolbar.limit, getInitParam("default_view_limit"));
 
                daemon_enabled = getInitParam("daemon_enabled") == 1;
                daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;