outputFeedList: fix markup problems

[tt-rss.git] / functions.js

diff --git a/functions.js b/functions.js
index 39b77d6a011b74aca2866829b8cda2d9ef6cd16c..b26f75fd8a1ebd7d719d6ce952a4592d6c2e1705 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -7,6 +7,10 @@ function browser_has_opacity() {
                navigator.userAgent.match("Opera") != null;
 }
 
+function is_msie() {
+       return navigator.userAgent.match("MSIE");
+}
+
 function is_opera() {
        return navigator.userAgent.match("Opera");
 }
@@ -140,6 +144,10 @@ function notify_real(msg, no_hide, n_type) {
 
        */
 
+       if (typeof __ != 'undefined') {
+               msg = __(msg);
+       }
+
        if (n_type == 1) {
                n.className = "notify";
        } else if (n_type == 2) {
@@ -424,8 +432,10 @@ function setCookie(name, value, lifetime, path, domain, secure) {
        
        if (lifetime) {
                d = new Date();
-               d.setTime(lifetime * 1000);
+               d.setTime(d.getTime() + (lifetime * 1000));
        }
+
+       debug("setCookie: " + name + " => " + value + ": " + d);
        
        int_setCookie(name, value, d, path, domain, secure);
 
@@ -1242,11 +1252,18 @@ function getRelativeFeedId(list, id, direction, unread_only) {
        }
 }
 
-function showBlockElement(id) {
+function showBlockElement(id, h_id) {
        var elem = document.getElementById(id);
 
        if (elem) {
                elem.style.display = "block";
+
+               if (h_id) {
+                       elem = document.getElementById(h_id);
+                       if (elem) {
+                               elem.style.display = "none";
+                       }
+               }
        } else {
                alert("[showBlockElement] can't find element with id " + id);
        } 
@@ -1320,7 +1337,7 @@ function displayDlg(id, param) {
                return
        }
 
-       notify("");
+       notify_progress("Loading, please wait...");
 
        xmlhttp.open("GET", "backend.php?op=dlg&id=" +
                param_escape(id) + "&param=" + param_escape(param), true);
@@ -1343,7 +1360,9 @@ function infobox_submit_callback() {
                        }
                } catch (e) { }
 
-//             notify_info(xmlhttp.responseText);
+               if (xmlhttp.responseText) {
+                       notify_info(xmlhttp.responseText);
+               }
 
        } 
 }
@@ -1364,7 +1383,7 @@ function infobox_callback() {
        }
 }
 
-function qaddFilter() {
+function addFilter() {
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -1400,7 +1419,7 @@ function isValidURL(s) {
        return s.match("http://") != null || s.match("https://") != null || s.match("feed://") != null;
 }
 
-function qafAdd() {
+function qaddFeed() {
 
        if (!xmlhttp_ready(xmlhttp)) {
                printLockingError();
@@ -1425,9 +1444,16 @@ function qafAdd() {
        
        var query = Form.serialize("feed_add_form");
        
-       xmlhttp.open("GET", "backend.php?" + query, true);
+       debug("subscribe q: " + query);
+
+/*     xmlhttp.open("GET", "backend.php?" + query, true);
        xmlhttp.onreadystatechange=dlg_frefresh_callback;
-       xmlhttp.send(null);
+       xmlhttp.send(null); */
+
+       xmlhttp.open("POST", "backend.php", true);
+       xmlhttp.onreadystatechange=dlg_frefresh_callback;
+       xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+       xmlhttp.send(query);
 
        return false;
 }
@@ -1494,49 +1520,13 @@ function debug(msg) {
 }
 
 function getInitParam(key) {
-       return getMainContext().init_params[key];
+       return init_params[key];
 }
 
-function storeInitParam(key, value, is_client) {
-       try {
-               if (!is_client) {
-                       if (getMainContext().init_params[key] != value) {
-                               debug("storeInitParam: " + key + " => " + value);
-                               //new Ajax.Request("backend.php?op=rpc&subop=storeParam&key=" + 
-                               //      param_escape(key) + "&value=" + param_escape(value));   
-                               var f = getMainContext().document.getElementById("backReqBox");
-                               f.src = "backend.php?op=rpc&subop=storeParam&key=" + 
-                                       param_escape(key) + "&value=" + param_escape(value);
-                       }
-               }
-               getMainContext().init_params[key] = value;
-       } catch (e) {
-               exception_error("storeInitParam", e);
-       }
+function storeInitParam(key, value) {
+       debug("<b>storeInitParam is OBSOLETE: " + key + " => " + value + "</b>");
 }
 
-/*
-function storeInitParams(params, is_client) {
-       try {
-               var s = "";
-
-               for (k in params) {
-                       if (getMainContext().init_params[k] != params[k]) {
-                               s += k + "=" + params[k] + ";";
-                               getMainContext().init_params[k] = params[k];
-                       }
-               } 
-
-               debug("storeInitParams: " + s);
-       
-               if (!is_client) {
-                       new Ajax.Request("backend.php?op=rpc&subop=storeParams&str=" + s);
-               }
-       } catch (e) {
-               exception_error("storeInitParams", e);
-       }
-}*/
-
 function fatalError(code, message) {
        try {