cdm tweaks, misc fixes

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

diff --git a/tt-rss.js b/tt-rss.js
index 2bd5068df69c5dfb410e87b16f4adaffcbb6101f..0e4c15485995af926e5a53860314a91a9c730f57 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -20,6 +20,12 @@ var xmlhttp_ctr = Ajax.getTransport();
 
 var init_params = new Object();
 
+var op_history = new Array();
+
+function tagsAreDisplayed() {
+       return display_tags;
+}
+
 function toggleTags() {
        display_tags = !display_tags;
 
@@ -31,6 +37,8 @@ function toggleTags() {
                p.innerHTML = "display tags";
        }
        
+       notify("Loading, please wait...");
+
        updateFeedList();
 }
 
@@ -58,32 +66,7 @@ function refetch_callback() {
 
                        last_refetch = date.getTime() / 1000;
 
-                       if (!xmlhttp_ctr.responseXML) {
-                               notify("refetch_callback: backend did not return valid XML", true, true);
-                               return;
-                       }
-               
-                       var reply = xmlhttp_ctr.responseXML.firstChild;
-       
-                       if (!reply) {
-                               notify("refetch_callback: backend did not return expected XML object", true, true);
-                               updateTitle("");
-                               return;
-                       } 
-       
-                       var error_code = reply.getAttribute("error-code");
-               
-                       if (error_code && error_code != 0) {
-                               return fatalError(error_code, reply.getAttribute("error-msg"));
-                       }
-
-                       var counters = reply.firstChild;
-       
-                       parse_counters(counters, true);
-
-                       var runtime_info = counters.nextSibling;
-
-                       parse_runtime_info(runtime_info);
+                       parse_counters_reply(xmlhttp_ctr, true);
 
                        debug("refetch_callback: done");
 
@@ -171,7 +154,7 @@ function scheduleFeedUpdate(force) {
                omode = "T";
        } else {
                if (display_tags) {
-                       omode = "t";
+                       omode = "tl";
                } else {
                        omode = "flc";
                }
@@ -207,6 +190,8 @@ function updateFeedList(silent, fetch) {
 //             notify("Loading feed list...");
 //     }
 
+       debug("<b>updateFeedList</b>");
+
        var query_str = "backend.php?op=feeds";
 
        if (display_tags) {
@@ -247,9 +232,16 @@ function catchupAllFeeds() {
 
        notify("Marking all feeds as read...");
 
-       var feeds_frame = document.getElementById("feeds-frame");
+       debug("catchupAllFeeds Q=" + query_str);
 
-       feeds_frame.src = query_str;
+       if (xmlhttp_ready(xmlhttp)) {
+               xmlhttp.open("GET", query_str, true);
+               xmlhttp.onreadystatechange=feedlist_callback;
+               xmlhttp.send(null);
+       } else {
+               debug("xmlhttp busy");
+               //printLockingError();
+       }   
 
        global_unread = 0;
        updateTitle("");
@@ -372,7 +364,9 @@ function init() {
                        debug('debug mode activated');
                }
 
-               xmlhttp.open("GET", "backend.php?op=rpc&subop=sanityCheck", true);
+               var params = "&ua=" + param_escape(navigator.userAgent);
+
+               xmlhttp.open("GET", "backend.php?op=rpc&subop=sanityCheck" + params, true);
                xmlhttp.onreadystatechange=backend_sanity_check_callback;
                xmlhttp.send(null);
 
@@ -432,6 +426,10 @@ function quickMenuGo(opid) {
                        displayDlg("quickAddFeed");
                        return;
                }
+
+               if (opid == "qmcEditFeed") {
+                       editFeedDlg(getActiveFeedId());
+               }
        
                if (opid == "qmcRemoveFeed") {
                        var actid = getActiveFeedId();
@@ -526,6 +524,11 @@ function toggleDispRead() {
 }
 
 function parse_runtime_info(elem) {
+       if (!elem) {
+               debug("parse_runtime_info: elem is null, aborting");
+               return;
+       }
+
        var param = elem.firstChild;
 
        debug("parse_runtime_info: " + param);
@@ -569,3 +572,145 @@ function userSwitch() {
        var user = chooser[chooser.selectedIndex].value;
        window.location = "tt-rss.php?swu=" + user;
 }
+
+function editFeedDlg(feed) {
+
+       disableHotkeys();
+
+       if (!feed) {
+               alert("Please select some feed first.");
+               return;
+       }
+
+       if (feed <= 0 || active_feed_is_cat || tagsAreDisplayed()) {
+               alert("You can't edit this kind of feed.");
+               return;
+       }
+
+       if (xmlhttp_ready(xmlhttp)) {
+               xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=editfeed&id=" +
+                       param_escape(feed), true);
+               xmlhttp.onreadystatechange=infobox_callback;
+               xmlhttp.send(null);
+       } else {
+               printLockingError();
+       }
+}
+
+/* this functions duplicate those of prefs.js feed editor, with
+       some differences because there is no feedlist */
+
+function feedEditCancel() {
+       closeInfoBox();
+       return false;
+}
+
+function feedEditSave() {
+
+       try {
+       
+               if (!xmlhttp_ready(xmlhttp)) {
+                       printLockingError();
+                       return
+               }
+
+               // FIXME: add parameter validation
+
+               var query = Form.serialize("edit_feed_form");
+
+               notify("Saving feed...");
+
+               xmlhttp.open("POST", "backend.php", true);
+               xmlhttp.onreadystatechange=dlg_frefresh_callback;
+               xmlhttp.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+               xmlhttp.send(query);
+
+               closeInfoBox();
+
+               return false;
+
+       } catch (e) {
+               exception_error("feedEditSave (main)", e);
+       } 
+}
+
+function localHotkeyHandler(e) {
+
+       var keycode;
+
+       if (window.event) {
+               keycode = window.event.keyCode;
+       } else if (e) {
+               keycode = e.which;
+       }
+
+       var shift_key = false;
+
+       try {
+               shift_key = e.shiftKey;
+       } catch (e) { }
+
+       if (keycode == 66 && shift_key) { // shift-B
+
+               var op = history_pop();
+
+               if (op) {
+                       var op_s = op.split(":");
+
+                       var i;
+                       for (i = 0; i < op_s.length; i++) {
+                               if (op_s[i] == 'undefined') {
+                                       op_s[i] = undefined;
+                               }
+
+                               if (op_s[i] == 'false') {
+                                       op_s[i] = false;
+                               }
+
+                               if (op_s[i] == 'true') {
+                                       op_s[i] = true;
+                               }
+                               
+                       }
+
+                       debug("history split: " + op_s);
+
+                       if (op_s[0] == "ARTICLE") {
+                               debug("history: reverting to article " + op_s[1] + "/" + op_s[2]);
+                               view(op_s[1], op_s[2], true);
+                       }
+
+                       if (op_s[0] == "FEED") {
+                               viewfeed(op_s[1], op_s[2], op_s[3], op_s[4], true);
+                       }
+
+               } else {
+                       notify("No operation to undo");
+               }
+
+               return false;
+
+       }       
+
+       debug("LKP=" + keycode);
+}
+
+function history_push(op) {
+       debug("history_push: " + op);
+       op_history.push(op);
+
+       while (op_history.length > 30) {
+               op_history.shift();
+       }
+}
+
+function history_pop() {
+       var op = op_history.pop();
+       debug("history_pop: " + op);
+       return op;
+}
+
+function history_clear() {
+       debug("history_clear");
+       op_history.clear();
+}