redirect to login page when session is expired

[tt-rss.git] / functions.js

diff --git a/functions.js b/functions.js
index 7854b07d6e40c418c9cdedc7cfe4408ae565e8c8..d7dcd08f4519848adac726b9fc1d718a1a64df3a 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -129,11 +129,10 @@ function hotkey_handler(e) {
                seq = seq + "" + keycode;
        }
 
-       var piggie = document.getElementById("piggie");
-
-       if (piggie) {
+       if (document.getElementById("piggie")) {
 
                if (seq.match("807371717369")) {
+                       seq = "";
                        localPiggieFunction(true);
                } else {
                        localPiggieFunction(false);
@@ -165,7 +164,7 @@ function cleanSelectedList(element) {
                        if (child.id == "feedCatHolder") {
                                var fcat = child.lastChild;
                                for (j = 0; j < fcat.childNodes.length; j++) {
-                                       var feed = fcat.childNodes[j];
+                                       var feed = fcat.childNodes[j];                                  
                                        feed.className = feed.className.replace("Selected", "");
                                }               
                        }
@@ -524,8 +523,13 @@ function hideOrShowFeeds(doc, hide) {
 
 }
 
-function fatalError(code) {
-       window.location = "error.php?c=" + param_escape(code);
+function fatalError(code, params) {
+       if (!params) {
+               window.location = "error.php?c=" + param_escape(code);
+       } else {
+               window.location = "error.php?c=" + param_escape(code) + 
+                       "&p=" + param_escape(params);
+       }
 }
 
 function selectTableRow(r, do_select) {
@@ -580,9 +584,25 @@ function selectTableRowsByIdPrefix(content_id, prefix, check_prefix, do_select,
                                }
                        } else if (reset_others) {
                                selectTableRow(content.rows[i], false);
+
+                               var row_id = content.rows[i].id.replace(prefix, "");
+                               var check = document.getElementById(check_prefix + row_id);
+
+                               if (check) {
+                                       check.checked = false;
+                               }
+
                        }
                } else if (reset_others) {
                        selectTableRow(content.rows[i], false);
+
+                       var row_id = content.rows[i].id.replace(prefix, "");
+                       var check = document.getElementById(check_prefix + row_id);
+
+                       if (check) {
+                               check.checked = false;
+                       }
+
                }
        }
 }