tweak error message

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

diff --git a/tt-rss.js b/tt-rss.js
index 34dab4d3adf3bc9eff007c9ae1d77f915be74c9a..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();
@@ -32,12 +33,12 @@ function toggleTags() {
        var p = document.getElementById("dispSwitchPrompt");
 
        if (display_tags) {
-               p.innerHTML = "display feeds";
+               p.innerHTML = __("display feeds");
        } else {
-               p.innerHTML = "display tags";
+               p.innerHTML = __("display tags");
        }
        
-       notify("Loading, please wait...");
+       notify_progress("Loading, please wait...");
 
        updateFeedList();
 }
@@ -71,10 +72,10 @@ function refetch_callback() {
                        debug("refetch_callback: done");
 
                        if (!daemon_enabled && !daemon_refresh_only) {
-                               notify("All feeds updated.");
+                               notify_info("All feeds updated.");
                                updateTitle("");
                        } else {
-                               notify("");
+                               //notify("");
                        }
                } catch (e) {
                        exception_error("refetch_callback", e);
@@ -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) {
@@ -135,7 +145,7 @@ function backend_sanity_check_callback() {
 function scheduleFeedUpdate(force) {
 
        if (!daemon_enabled && !daemon_refresh_only) {
-               notify("Updating feeds, please wait.", true);
+               notify_progress("Updating feeds, please wait.", true);
                updateTitle("Updating");
        }
 
@@ -167,6 +177,9 @@ function scheduleFeedUpdate(force) {
 
        var date = new Date();
 
+       var timestamp = Math.round(date.getTime() / 1000);
+       query_str = query_str + "&ts=" + timestamp
+
        if (!xmlhttp_ready(xmlhttp_ctr) && last_refetch < date.getTime() / 1000 - 60) {
                debug("<b>xmlhttp seems to be stuck, aborting</b>");
                xmlhttp_ctr.abort();
@@ -202,11 +215,9 @@ function updateFeedList(silent, fetch) {
                query_str = query_str + "&actid=" + getActiveFeedId();
        }
 
-       if (navigator.userAgent.match("Opera")) {
-               var date = new Date();
-               var timestamp = Math.round(date.getTime() / 1000);
-               query_str = query_str + "&ts=" + timestamp
-       }
+       var date = new Date();
+       var timestamp = Math.round(date.getTime() / 1000);
+       query_str = query_str + "&ts=" + timestamp
        
        if (fetch) query_str = query_str + "&fetch=yes";
 
@@ -230,7 +241,7 @@ function catchupAllFeeds() {
 
        var query_str = "backend.php?op=feeds&subop=catchupAll";
 
-       notify("Marking all feeds as read...");
+       notify_progress("Marking all feeds as read...");
 
        debug("catchupAllFeeds Q=" + query_str);
 
@@ -375,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 {
@@ -383,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;
@@ -473,7 +500,7 @@ function quickMenuGo(opid) {
 
 function qfdDelete(feed_id) {
 
-       notify("Removing feed...");
+       notify_progress("Removing feed...");
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -551,7 +578,7 @@ function parse_runtime_info(elem) {
                }
 
                if (k == "daemon_is_running" && v != 1) {
-                       notify("<span onclick=\"javascript:explainError(1)\">Warning: Update daemon is not runing.</span>", true, true);
+                       notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not runing.</span>");
                }
 
 /*             var w = document.getElementById("noDaemonWarning");
@@ -633,7 +660,7 @@ function feedEditSave() {
 
                var query = Form.serialize("edit_feed_form");
 
-               notify("Saving feed...");
+               notify_progress("Saving feed...");
 
                xmlhttp.open("POST", "backend.php", true);
                xmlhttp.onreadystatechange=dlg_frefresh_callback;
@@ -700,7 +727,7 @@ function localHotkeyHandler(e) {
                        }
 
                } else {
-                       notify("No operation to undo");
+                       notify_error("No operation to undo");
                }
 
                return false;