tag filter action - block empty tags

[tt-rss.git] / functions.js

diff --git a/functions.js b/functions.js
index db1351510ac7417b5132a9f9b7a69290674bb4d5..2e7ad680700dcb4bb193492a782f9961e5c34045 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -1,5 +1,5 @@
 var hotkeys_enabled = true;
-
+var debug_mode_enabled = false;
 var xmlhttp_rpc = Ajax.getTransport();
 
 function browser_has_opacity() {
@@ -166,6 +166,13 @@ function hotkey_handler(e) {
        try {
 
                var keycode;
+               var shift_key = false;
+
+               try {
+                       shift_key = e.shiftKey;
+               } catch (e) {
+
+               }
        
                if (!hotkeys_enabled) return;
        
@@ -179,7 +186,7 @@ function hotkey_handler(e) {
                        return scheduleFeedUpdate(true);
                }
 
-               if (keycode == 83) { // r
+               if (keycode == 83) { // s
                        return displayDlg("search", getActiveFeedId());
                }
 
@@ -219,13 +226,30 @@ function hotkey_handler(e) {
                        }
                }
                
+               if (keycode == 68 && shift_key) { // d
+                       if (!debug_mode_enabled) {
+                               document.getElementById('debug_output').style.display = 'block';
+                               debug('debug mode activated');
+                       } else {
+                               document.getElementById('debug_output').style.display = 'none';
+                       }
+
+                       debug_mode_enabled = !debug_mode_enabled;
+               }
+
+               if (keycode == 69 && shift_key) {
+                       return editFeedDlg(getActiveFeedId());
+               }
+
                if (typeof localHotkeyHandler != 'undefined') {
                        try {
-                               localHotkeyHandler(keycode);
+                               return localHotkeyHandler(e);
                        } catch (e) {
                                exception_error("hotkey_handler, local:", e);
                        }
                }
+
+               debug("KP=" + keycode);
        } catch (e) {
                exception_error("hotkey_handler", e);
        }
@@ -505,7 +529,12 @@ function parse_counters(reply, scheduled_call) {
                        if (t == "category") {
                                var catctr = document.getElementById("FCATCTR-" + id);
                                if (catctr) {
-                                       catctr.innerHTML = "(" + ctr + " unread)";
+                                       catctr.innerHTML = "(" + ctr + ")";
+                                       if (ctr > 0) {
+                                               catctr.className = "catCtrHasUnread";
+                                       } else {
+                                               catctr.className = "catCtrNoUnread";
+                                       }
                                }
                                continue;
                        }
@@ -589,10 +618,59 @@ function parse_counters(reply, scheduled_call) {
        }
 }
 
+function parse_counters_reply(xmlhttp, scheduled_call) {
+
+       if (!xmlhttp.responseXML) {
+               notify("refetch_callback: backend did not return valid XML", true, true);
+               return;
+       }
+
+       var reply = xmlhttp.responseXML.firstChild;
+       
+       if (!reply) {
+               notify("refetch_callback: backend did not return expected XML object", true, true);
+               updateTitle("");
+               return;
+       } 
+       
+       var error_code = false;
+       var error_msg = false;
+
+       if (reply.firstChild) {
+               error_code = reply.firstChild.getAttribute("error-code");
+               error_msg = reply.firstChild.getAttribute("error-msg");
+       }
+
+       if (!error_code) {      
+               error_code = reply.getAttribute("error-code");
+               error_msg = reply.getAttribute("error-msg");
+       }
+       
+       if (error_code && error_code != 0) {
+               debug("refetch_callback: got error code " + error_code);
+               return fatalError(error_code, error_msg);
+       }
+
+       var counters = reply.firstChild;
+       
+       parse_counters(counters, scheduled_call);
+
+       var runtime_info = counters.nextSibling;
+
+       parse_runtime_info(runtime_info);
+
+       if (getInitParam("feeds_sort_by_unread") == 1) {
+                       resort_feedlist();              
+       }       
+
+       hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1);
+
+}
+
 function all_counters_callback() {
        if (xmlhttp_rpc.readyState == 4) {
                try {
-                       if (!xmlhttp_rpc.responseXML || !xmlhttp_rpc.responseXML.firstChild) {
+/*                     if (!xmlhttp_rpc.responseXML || !xmlhttp_rpc.responseXML.firstChild) {
                                debug("[all_counters_callback] backend did not return valid XML");
                                return;
                        }
@@ -615,7 +693,11 @@ function all_counters_callback() {
                                resort_feedlist();              
                        }       
 
-                       hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1);
+                       hideOrShowFeeds(document, getInitParam("hide_read_feeds") == 1); */
+                       
+                       debug("in all_counters_callback");
+
+                       parse_counters_reply(xmlhttp_rpc);
 
                } catch (e) {
                        exception_error("all_counters_callback", e);
@@ -700,6 +782,14 @@ function update_all_counters(feed) {
                        query = query + "&aid=" + feed;
                }
 
+               if (tagsAreDisplayed()) {
+                       query = query + "&omode=lt";
+               } else {
+                       query = query + "&omode=flc";
+               }
+
+               debug("update_all_counters QUERY: " + query);
+
                xmlhttp_rpc.open("GET", query, true);
                xmlhttp_rpc.onreadystatechange=all_counters_callback;
                xmlhttp_rpc.send(null);
@@ -779,6 +869,11 @@ function hideOrShowFeedsCategory(doc, node, hide, cat_node) {
 
        var cat_unread = 0;
 
+       if (!node) {
+               debug("hideOrShowFeeds: passed node is null, aborting");
+               return;
+       }
+
        if (node.hasChildNodes() && node.firstChild.nextSibling != false) {  
                for (i = 0; i < node.childNodes.length; i++) {
                        if (node.childNodes[i].nodeName != "LI") { continue; }
@@ -1394,12 +1489,18 @@ function storeInitParams(params, is_client) {
 
 function fatalError(code, message) {
        try {   
-               var fe = document.getElementById("fatal_error");
-               var fc = document.getElementById("fatal_error_msg");
 
-               fc.innerHTML = "Code " + code + ": " + message;
+               if (code != 6) {
 
-               fe.style.display = "block";
+                       var fe = document.getElementById("fatal_error");
+                       var fc = document.getElementById("fatal_error_msg");
+       
+                       fc.innerHTML = "Code " + code + ": " + message;
+       
+                       fe.style.display = "block";
+               } else {
+                       window.location.href = "login.php?rt=none";                     
+               }
 
        } catch (e) {
                exception_error("fatalError", e);