]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
fix frontend not knowing about always expanded cdm
[tt-rss.git] / tt-rss.js
index f6eea6661ea35575aa69d71ad12cf3ebeeec03f5..917196ba9c445a6ca910b6b96c803610c9abce68 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1,34 +1,27 @@
-
 var total_unread = 0;
-var first_run = true;
 var display_tags = false;
 var global_unread = -1;
-var active_title_text = "";
-var current_subtitle = "";
-var daemon_enabled = false;
-var daemon_refresh_only = false;
-//var _qfd_deleted_feed = 0;
 var firsttime_update = true;
 var _active_feed_id = 0;
 var _active_feed_is_cat = false;
 var number_of_feeds = 0;
-var sanity_check_done = false;
-var _hfd_scrolltop = 0;
 var hotkey_prefix = false;
-var init_params = new Object();
+var hotkey_prefix_pressed = false;
+var init_params = {};
 var ver_offset = 0;
 var hor_offset = 0;
 var feeds_sort_by_unread = false;
 var feedlist_sortable_enabled = false;
+var _force_scheduled_update = false;
+var last_scheduled_update = false;
 
 function activeFeedIsCat() {
        return _active_feed_is_cat;
 }
 
 function getActiveFeedId() {
-//     return getCookie("ttrss_vf_actfeed");
        try {
-               debug("gAFID: " + _active_feed_id);
+               //console.log("gAFID: " + _active_feed_id);
                return _active_feed_id;
        } catch (e) {
                exception_error("getActiveFeedId", e);
@@ -36,9 +29,8 @@ function getActiveFeedId() {
 }
 
 function setActiveFeedId(id, is_cat) {
-//     return setCookie("ttrss_vf_actfeed", id);
        try {
-               debug("sAFID(" + id + ", " + is_cat + ")");
+               //console.log("sAFID(" + id + ", " + is_cat + ")");
                _active_feed_id = id;
 
                if (is_cat != undefined) {
@@ -63,7 +55,7 @@ function toggleTags(show_all) {
 
        try {
 
-       debug("toggleTags: " + show_all + "; " + display_tags);
+       console.log("toggleTags: " + show_all + "; " + display_tags);
 
        var p = $("dispSwitchPrompt");
 
@@ -89,185 +81,38 @@ function toggleTags(show_all) {
 
 function dlg_frefresh_callback(transport, deleted_feed) {
        if (getActiveFeedId() == deleted_feed) {
-               var h = $("headlines-frame");
-               if (h) {
-                       h.innerHTML = "<div class='whiteBox'>" + __('No feed selected.') + "</div>";
-               }
+               setTimeout("viewfeed(-5)", 100);
        }
 
        setTimeout('updateFeedList(false, false)', 50);
        closeInfoBox();
 }
 
-function refetch_callback2(transport) {
+function updateFeedList() {
        try {
-
-               var date = new Date();
-
-               parse_counters_reply(transport, true);
-
-               debug("refetch_callback2: done");
-
-/*             if (!daemon_enabled && !daemon_refresh_only) {
-                       notify_info("All feeds updated.");
-                       updateTitle("");
-               } else {
-                       //notify("");
-               } */
-       } catch (e) {
-               exception_error("refetch_callback", e);
-               updateTitle("");
-       }
-}
-
-function backend_sanity_check_callback(transport) {
-
-       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 (!transport.responseXML) {
-                       if (!store) {
-                               fatalError(3, "Sanity check: Received reply is not XML", 
-                                       transport.responseText);
-                               return;
-                       } else {
-                               init_offline();
-                               return;
-                       }
-               }
-
-               var reply = transport.responseXML.firstChild.firstChild;
-
-               if (!reply) {
-                       fatalError(3, "Sanity check: invalid RPC reply", transport.responseText);
-                       return;
-               }
-
-               var error_code = reply.getAttribute("error-code");
+               //console.log("updateFeedList");
+       
+               if (offline_mode) return render_offline_feedlist();
+       
+               var query_str = "backend.php?op=feeds";
        
-               if (error_code && error_code != 0) {
-                       return fatalError(error_code, reply.getAttribute("error-msg"));
-               }
-
-               debug("sanity check ok");
-
-               var params = reply.nextSibling;
-
-               if (params) {
-                       debug('reading init-params...');
-                       var param = params.firstChild;
-
-                       while (param) {
-                               var k = param.getAttribute("key");
-                               var v = param.getAttribute("value");
-                               debug(k + " => " + v);
-                               init_params[k] = v;                                     
-
-                               if (db) {
-                                       db.execute("DELETE FROM init_params WHERE key = ?", [k]);
-                                       db.execute("INSERT INTO init_params (key,value) VALUES (?, ?)",
-                                               [k, v]);
-                               }
-
-                               param = param.nextSibling;
-                       }
-               }
-
-               sanity_check_done = true;
-
-               init_second_stage();
-
-       } catch (e) {
-               exception_error("backend_sanity_check_callback", e, transport); 
-       } 
-}
-
-function scheduleFeedUpdate(force) {
-
-       debug("in scheduleFeedUpdate");
-
-/*     if (!daemon_enabled && !daemon_refresh_only) {
-               notify_progress("Updating feeds...", true);
-       } */
-
-       var query_str = "backend.php?op=rpc&subop=";
-
-       if (force) {
-               query_str = query_str + "forceUpdateAllFeeds";
-       } else {
-               query_str = query_str + "updateAllFeeds";
-       }
-
-       var omode;
-
-       if (firsttime_update && !navigator.userAgent.match("Opera")) {
-               firsttime_update = false;
-               omode = "T";
-       } else {
                if (display_tags) {
-                       omode = "tl";
-               } else {
-                       omode = "flc";
+                       query_str = query_str + "&tags=1";
                }
-       }
        
-       query_str = query_str + "&omode=" + omode;
-       query_str = query_str + "&uctr=" + global_unread;
-
-       var date = new Date();
-       var timestamp = Math.round(date.getTime() / 1000);
-       query_str = query_str + "&ts=" + timestamp
-
-       debug("REFETCH query: " + query_str);
-
-       new Ajax.Request(query_str, {
-               onComplete: function(transport) { 
-                               refetch_callback2(transport); 
+               if (getActiveFeedId() && !activeFeedIsCat()) {
+                       query_str = query_str + "&actid=" + getActiveFeedId();
+               }
+               
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
+                       onComplete: function(transport) { 
+                               render_feedlist(transport.responseText);
                        } });
-}
 
-function updateFeedList(silent, fetch) {
-
-//     if (silent != true) {
-//             notify("Loading feed list...");
-//     }
-
-       debug("<b>updateFeedList</b>");
-
-       if (offline_mode) return render_offline_feedlist();
-
-       var query_str = "backend.php?op=feeds";
-
-       if (display_tags) {
-               query_str = query_str + "&tags=1";
-       }
-
-       if (getActiveFeedId() && !activeFeedIsCat()) {
-               query_str = query_str + "&actid=" + getActiveFeedId();
+       } catch (e) {
+               exception_error("updateFeedList", e);
        }
-
-       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";
-
-//     var feeds_frame = $("feeds-frame");
-//     feeds_frame.src = query_str;
-
-       debug("updateFeedList Q=" + query_str);
-
-       new Ajax.Request(query_str, {
-               onComplete: function(transport) { 
-                       feedlist_callback2(transport); 
-               } });
-
 }
 
 function catchupAllFeeds() {
@@ -280,9 +125,10 @@ function catchupAllFeeds() {
 
                notify_progress("Marking all feeds as read...");
 
-               debug("catchupAllFeeds Q=" + query_str);
+               //console.log("catchupAllFeeds Q=" + query_str);
 
-               new Ajax.Request(query_str, {
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
                        onComplete: function(transport) { 
                                feedlist_callback2(transport); 
                        } });
@@ -298,27 +144,66 @@ function viewCurrentFeed(subop) {
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), subop, activeFeedIsCat());
        } else {
-               disableContainerChildren("headlinesToolbar", false, document);
 //             viewfeed(-1, subop); // FIXME
        }
        return false; // block unneeded form submits
 }
 
-function viewfeed(feed, subop) {
+/*function viewfeed(feed, subop) {
        var f = window.frames["feeds-frame"];
        f.viewfeed(feed, subop);
-}
+} */
 
 function timeout() {
        if (getInitParam("bw_limit") == "1") return;
 
-       scheduleFeedUpdate(false);
+       try {
+          var date = new Date();
+      var ts = Math.round(date.getTime() / 1000);
+
+               if (ts - last_scheduled_update > 10 || _force_scheduled_update) {
+
+                       //console.log("timeout()");
+
+                       window.clearTimeout(counter_timeout_id);
+               
+                       var query_str = "?op=rpc&subop=getAllCounters";
+               
+                       var omode;
+               
+                       if (firsttime_update && !navigator.userAgent.match("Opera")) {
+                               firsttime_update = false;
+                               omode = "T";
+                       } else {
+                               if (display_tags) {
+                                       omode = "tl";
+                               } else {
+                                       omode = "flc";
+                               }
+                       }
+                       
+                       query_str = query_str + "&omode=" + omode;
 
-       var refresh_time = getInitParam("feeds_frame_refresh");
+                       if (!_force_scheduled_update)
+                               query_str = query_str + "&last_article_id=" + getInitParam("last_article_id");
+               
+                       //console.log("[timeout]" + query_str);
+               
+                       new Ajax.Request("backend.php", {
+                               parameters: query_str,
+                               onComplete: function(transport) { 
+                                               handle_rpc_reply(transport, true);
+                                       } });
 
-       if (!refresh_time) refresh_time = 600; 
+                       last_scheduled_update = ts;
+                       _force_scheduled_update = false;
+               }
 
-       setTimeout("timeout()", refresh_time*1000);
+       } catch (e) {
+               exception_error("timeout", e);
+       }
+
+       setTimeout("timeout()", 3000);
 }
 
 function resetSearch() {
@@ -330,46 +215,33 @@ function resetSearch() {
        }
 }
 
-function searchCancel() {
-       closeInfoBox(true);
-}
-
 function search() {
        closeInfoBox(); 
        viewCurrentFeed(0, "");
 }
 
-// if argument is undefined, current subtitle is not updated
-// use blank string to clear subtitle
-function updateTitle(s) {
+function updateTitle() {
        var tmp = "Tiny Tiny RSS";
 
-       if (s != undefined) {
-               current_subtitle = s;
-       }
-
        if (global_unread > 0) {
                tmp = tmp + " (" + global_unread + ")";
        }
 
-       if (current_subtitle) {
-               tmp = tmp + " - " + current_subtitle;
-       }
-
-       if (active_title_text.length > 0) {
-               tmp = tmp + " > " + active_title_text;
+       if (window.fluid) {
+               if (global_unread > 0) {
+                       window.fluid.dockBadge = global_unread;
+               } else {
+                       window.fluid.dockBadge = "";
+               }
        }
 
        document.title = tmp;
 }
 
 function genericSanityCheck() {
-
-//     if (!Ajax.getTransport()) fatalError(1);
-
-       setCookie("ttrss_vf_test", "TEST");
+       setCookie("ttrss_test", "TEST");
        
-       if (getCookie("ttrss_vf_test") != "TEST") {
+       if (getCookie("ttrss_test") != "TEST") {
                fatalError(2);
        }
 
@@ -380,30 +252,19 @@ function init() {
 
        try {
 
-               // this whole shebang is based on http://www.birnamdesigns.com/misc/busted2.html
-
-               if (arguments.callee.done) return;
-               arguments.callee.done = true;           
-
                init_gears();
 
-               disableContainerChildren("headlinesToolbar", true);
-
                Form.disable("main_toolbar_form");
 
                if (!genericSanityCheck()) 
                        return;
 
-               if (getURLParam('debug')) {
-                       Element.show("debug_output");
-                       debug('debug mode activated');
-               }
-
                var params = "&ua=" + param_escape(navigator.userAgent);
 
                loading_set_progress(30);
 
-               new Ajax.Request("backend.php?op=rpc&subop=sanityCheck" + params,       {
+               new Ajax.Request("backend.php", {
+                       parameters: "backend.php?op=rpc&subop=sanityCheck" + params,
                        onComplete: function(transport) {
                                        backend_sanity_check_callback(transport);
                                } });
@@ -417,7 +278,7 @@ function resize_headlines(delta_x, delta_y) {
 
        try {
 
-               debug("resize_headlines: " + delta_x + ":" + delta_y);
+               console.log("resize_headlines: " + delta_x + ":" + delta_y);
        
                var h_frame = $("headlines-frame");
                var c_frame = $("content-frame");
@@ -428,11 +289,11 @@ function resize_headlines(delta_x, delta_y) {
 
                if (!c_frame || !h_frame) return;
        
-               if (feeds_frame && getInitParam("theme") == "compat") {
+               if (feeds_frame && getInitParam("theme") == "old-skool") {
                                feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
                }
        
-               if (getInitParam("theme") == "3pane") {
+               if (getInitParam("theme_options").match("horiz_resize")) {
        
                        if (delta_x != undefined) {
                                if (c_frame.offsetLeft - delta_x > feeds_frame.offsetWidth + feeds_frame.offsetLeft + 100 && c_frame.offsetWidth + delta_x > 100) {
@@ -440,7 +301,7 @@ function resize_headlines(delta_x, delta_y) {
                                }
                        }
        
-                       debug("resize_headlines: HOR-mode: " + hor_offset);
+                       console.log("resize_headlines: HOR-mode: " + hor_offset);
        
                        c_frame.style.width = (400 + hor_offset) + "px";
                        h_frame.style.right = c_frame.offsetWidth - 1 + "px";
@@ -450,7 +311,7 @@ function resize_headlines(delta_x, delta_y) {
                                4) + "px";
                        resize_grab.style.display = "block";
 
-                       resize_handle.src = "themes/3pane/images/resize_handle_vert.png";
+                       //resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
                        resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
        
                } else {
@@ -461,27 +322,17 @@ function resize_headlines(delta_x, delta_y) {
                                }
                        }
        
-                       debug("resize_headlines: VER-mode: " + ver_offset);
+                       console.log("resize_headlines: VER-mode: " + ver_offset);
        
                        h_frame.style.height = (300 - ver_offset) + "px";
        
                        c_frame.style.top = (h_frame.offsetTop + h_frame.offsetHeight + 0) + "px";
                        h_frame.style.height = h_frame.offsetHeight + "px";
-       
-                       var theme_c = 0;
-       
-                       if (getInitParam("theme") == "graycube") {
-                               theme_c = 1;
-                       }
 
-                       if (getInitParam("theme") == "graycube" || getInitParam("theme") == "compat") {
-                               resize_handle.src = "themes/graycube/images/resize_handle_horiz.png";
-                       }
-       
-/*                     resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 
-                               4 - theme_c) + "px";
-                       resize_grab.style.display = "block"; */
-       
+                       // Workaround for Opera: force the content page to be re-rendered, 
+                       // so it is not truncated:
+                       var content_pane = $("content-insert");
+                       content_pane.innerHTML = content_pane.innerHTML;
                }
        
                if (getInitParam("cookie_lifetime") != 0) {
@@ -504,55 +355,42 @@ function init_second_stage() {
 
        try {
 
-               delCookie("ttrss_vf_test");
+               delCookie("ttrss_test");
 
-//             document.onresize = resize_headlines;
+               window.onresize=resize_headlines;
 
                var toolbar = document.forms["main_toolbar_form"];
 
                dropboxSelect(toolbar.view_mode, getInitParam("default_view_mode"));
-               dropboxSelect(toolbar.limit, getInitParam("default_view_limit"));
                dropboxSelect(toolbar.order_by, getInitParam("default_view_order_by"));
 
-               daemon_enabled = getInitParam("daemon_enabled") == 1;
-               daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
-/*             var fl = cache_find_param("FEEDLIST", getInitParam("num_feeds"));
-
-               if (fl) {
-                       render_feedlist(fl);
-                       if ($("feedList")) {
-                               request_counters();
-                       } else {
-                               setTimeout('updateFeedList(false, false)', 50);
-                       }
-               } else {
-                       setTimeout('updateFeedList(false, false)', 50);
-               } */
-
                setTimeout('updateFeedList(false, false)', 50);
 
-               debug("second stage ok");
+               console.log("second stage ok");
 
                loading_set_progress(60);
 
                ver_offset = parseInt(getCookie("ttrss_offset_ver"));
                hor_offset = parseInt(getCookie("ttrss_offset_hor"));
 
-               debug("got offsets from cookies: ver " + ver_offset + " hor " + hor_offset);
+               console.log("got offsets from cookies: ver " + ver_offset + " hor " + hor_offset);
 
                /* fuck IE */
 
                if (isNaN(hor_offset)) hor_offset = 0;
                if (isNaN(ver_offset)) ver_offset = 0;
 
-               debug("offsets from cookies [x:y]: " + hor_offset + ":" + ver_offset);
+               console.log("offsets from cookies [x:y]: " + hor_offset + ":" + ver_offset);
 
                resize_headlines();
 
                enable_offline_reading();
 
+               if (has_local_storage())
+                       localStorage.clear();
+
        } catch (e) {
                exception_error("init_second_stage", e);
        }
@@ -574,12 +412,15 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcSearch") {
-                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                               function() { 
+                                       document.forms['search_form'].query.focus();
+                               });
                        return;
                }
        
                if (opid == "qmcAddFeed") {
-                       displayDlg("quickAddFeed");
+                       quickAddFeed();
                        return;
                }
 
@@ -611,36 +452,6 @@ function quickMenuGo(opid) {
                        return;
                }
 
-               if (opid == "qmcClearFeed") {
-                       var actid = getActiveFeedId();
-
-                       if (!actid) {
-                               alert(__("Please select some feed first."));
-                               return;
-                       }
-
-                       if (activeFeedIsCat() || actid < 0) {
-                               alert(__("You can't clear this type of feed."));
-                               return;
-                       }       
-
-                       var fn = getFeedName(actid);
-
-                       var pr = __("Erase all non-starred articles in %s?").replace("%s", fn);
-
-                       if (confirm(pr)) {
-                               clearFeedArticles(actid);
-                       }
-               
-                       return;
-               }
-       
-
-               if (opid == "qmcUpdateFeeds") {
-                       scheduleFeedUpdate(true);
-                       return;
-               }
-       
                if (opid == "qmcCatchupAll") {
                        catchupAllFeeds();
                        return;
@@ -652,7 +463,8 @@ function quickMenuGo(opid) {
                }
        
                if (opid == "qmcAddFilter") {
-                       displayDlg("quickAddFilter", getActiveFeedId());
+                       displayDlg('quickAddFilter', '',
+                          function () {document.forms['filter_add_form'].reg_exp.focus();});
                }
 
                if (opid == "qmcAddLabel") {
@@ -674,15 +486,28 @@ function quickMenuGo(opid) {
                        resize_headlines();
                }
 
+               if (opid == "qmcToggleReorder") {
+                       feedlist_sortable_enabled = !feedlist_sortable_enabled;
+
+                       if (feedlist_sortable_enabled) {
+                               notify_info("Category reordering enabled");
+                               toggle_sortable_feedlist(true);
+                       } else {
+                               notify_info("Category reordering disabled");
+                               toggle_sortable_feedlist(false);
+                       }
+               }
+
                if (opid == "qmcResetCats") {
 
                        if (confirm(__("Reset category order?"))) {
 
-                               var query = "backend.php?op=feeds&subop=catsortreset";
+                               var query = "?op=feeds&subop=catsortreset";
 
                                notify_progress("Loading, please wait...", true);
 
-                               new Ajax.Request(query, {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) { 
                                                window.setTimeout('updateFeedList(false, false)', 50);
                                        } });
@@ -694,43 +519,21 @@ function quickMenuGo(opid) {
        }
 }
 
-function unsubscribeFeed(feed_id, title) {
-
-
-       var msg = __("Unsubscribe from %s?").replace("%s", title);
-
-       if (title == undefined || confirm(msg)) {
-               notify_progress("Removing feed...");
-
-               var query = "backend.php?op=pref-feeds&quiet=1&subop=remove&ids=" + feed_id;
-
-               new Ajax.Request(query, {
-                       onComplete: function(transport) {
-                                       dlg_frefresh_callback(transport, feed_id);
-                               } });
-       }
-
-       return false;
-}
-
-
-function updateFeedTitle(t) {
-       active_title_text = t;
-       updateTitle();
-}
-
 function toggleDispRead() {
        try {
 
-               var hide_read_feeds = (getInitParam("hide_read_feeds") == "1");
-
-               hide_read_feeds = !hide_read_feeds;
+               var hide = !(getInitParam("hide_read_feeds") == "1");
 
-               debug("toggle_disp_read => " + hide_read_feeds);
+               hideOrShowFeeds(hide);
 
-               hideOrShowFeeds(hide_read_feeds);
+               var query = "?op=rpc&subop=setpref&key=HIDE_READ_FEEDS&value=" + 
+                       param_escape(hide);
 
-               storeInitParam("hide_read_feeds", hide_read_feeds, true);
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) { 
+                               setInitParam("hide_read_feeds", hide);
+                       } });
                                
        } catch (e) {
                exception_error("toggleDispRead", e);
@@ -738,24 +541,20 @@ function toggleDispRead() {
 }
 
 function parse_runtime_info(elem) {
-       if (!elem) {
-               debug("parse_runtime_info: elem is null, aborting");
+
+       if (!elem || !elem.firstChild) {
+               console.warn("parse_runtime_info: invalid node passed");
                return;
        }
 
-       var param = elem.firstChild;
-
-       debug("parse_runtime_info: " + param);
+       var data = JSON.parse(elem.firstChild.nodeValue);
 
-       while (param) {
-               var k = param.getAttribute("key");
-               var v = param.getAttribute("value");
+       //console.log("parsing runtime info...");
 
-               debug("RI: " + k + " => " + v);
+       for (k in data) {
+               var v = data[k];
 
-               if (k == "num_feeds") {
-                       init_params[k] = v;                                     
-               }
+               // console.log("RI: " + k + " => " + v);
 
                if (k == "new_version_available") {
                        var icon = $("newVersionIcon");
@@ -766,34 +565,23 @@ function parse_runtime_info(elem) {
                                        icon.style.display = "none";
                                }
                        }
+                       return;
                }
 
                var error_flag;
 
                if (k == "daemon_is_running" && v != 1) {
                        notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true);
-                       error_flag = true;
+                       return;
                }
 
                if (k == "daemon_stamp_ok" && v != 1) {
                        notify_error("<span onclick=\"javascript:explainError(3)\">Update daemon is not updating feeds.</span>", true);
-                       error_flag = true;
-               }
-
-               if (!error_flag) {
-                       notify('');
+                       return;
                }
 
-/*             var w = $("noDaemonWarning");
-               
-               if (w) {
-                       if (k == "daemon_is_running" && v != 1) {
-                               w.style.display = "block";
-                       } else {
-                               w.style.display = "none";
-                       }
-               } */
-               param = param.nextSibling;
+               init_params[k] = v;                                     
+               notify('');
        }
 }
 
@@ -841,16 +629,20 @@ function editFeedDlg(feed) {
                var query = "";
        
                if (feed > 0) {
-                       query = "backend.php?op=pref-feeds&subop=editfeed&id=" +        param_escape(feed);
+                       query = "?op=pref-feeds&subop=editfeed&id=" +   param_escape(feed);
                } else {
-                       query = "backend.php?op=pref-labels&subop=edit&id=" +   param_escape(-feed-11);
+                       query = "?op=pref-labels&subop=edit&id=" +      param_escape(-feed-11);
                }
 
                disableHotkeys();
 
-               new Ajax.Request(query, {
+               notify_progress("Loading, please wait...", true);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                infobox_callback2(transport); 
+                               document.forms["edit_feed_form"].title.focus();
                        } });
 
        } catch (e) {
@@ -882,7 +674,7 @@ function feedEditSave() {
                                dlg_frefresh_callback(transport); 
                        } });
 
-
+               cache_flush();
                closeInfoBox();
 
                return false;
@@ -892,27 +684,13 @@ function feedEditSave() {
        } 
 }
 
-function clearFeedArticles(feed_id) {
-
-       notify_progress("Clearing feed...");
-
-       var query = "backend.php?op=pref-feeds&quiet=1&subop=clear&id=" + feed_id;
-
-       new Ajax.Request(query, {
-               onComplete: function(transport) {
-                               dlg_frefresh_callback(transport, feed_id);
-                       } });
-
-       return false;
-}
-
 function collapse_feedlist() {
        try {
-               debug("toggle_feedlist");
+               //console.log("collapse_feedlist");
                
                var theme = getInitParam("theme");
-               if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "compat") return;
+               if (theme != "" && 
+                               !getInitParam("theme_options").match("collapse_feedlist")) return;
 
                var fl = $("feeds-holder");
                var fh = $("headlines-frame");
@@ -924,7 +702,7 @@ function collapse_feedlist() {
 
                if (!Element.visible(fl)) {
                        Element.show(fl);
-                       fbtn.value = "<<";
+                       fbtn.innerHTML = "&lt;&lt;";
 
                        if (theme != "graycube") {
 
@@ -940,11 +718,13 @@ function collapse_feedlist() {
                                if (fc) fc.style.left = fl.offsetWidth + 40 + "px";
                        }
 
-                       setCookie("ttrss_vf_fclps", "0");
+                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=false";
+
+                       new Ajax.Request("backend.php", { parameters: query });
 
                } else {
                        Element.hide(fl);
-                       fbtn.value = ">>";
+                       fbtn.innerHTML = "&gt;&gt;";
 
                        if (theme != "graycube") {
 
@@ -962,20 +742,23 @@ function collapse_feedlist() {
 
                        }
 
-                       setCookie("ttrss_vf_fclps", "1");
+                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=true";
+
+                       new Ajax.Request("backend.php", { parameters: query });
+
                }
        } catch (e) {
-               exception_error("toggle_feedlist", e);
+               exception_error("collapse_feedlist", e);
        }
 }
 
 function viewModeChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
 function viewLimitChanged() {
-       cache_empty();
+       cache_flush();
        return viewCurrentFeed(0, '')
 }
 
@@ -985,9 +768,10 @@ function viewLimitChanged() {
                var pr = prompt(__("Assign score to article:"), score);
 
                if (pr != undefined) {
-                       var query = "backend.php?op=rpc&subop=setScore&id=" + id + "&score=" + pr;
+                       var query = "?op=rpc&subop=setScore&id=" + id + "&score=" + pr;
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) {
                                        viewCurrentFeed();
                                } });
@@ -1018,12 +802,13 @@ function rescoreCurrentFeed() {
        if (confirm(pr)) {
                notify_progress("Rescoring articles...");
 
-               var query = "backend.php?op=pref-feeds&subop=rescore&quiet=1&ids=" + actid;
+               var query = "?op=pref-feeds&subop=rescore&quiet=1&ids=" + actid;
 
-               new Ajax.Request(query, {
-               onComplete: function(transport) {
-                       viewCurrentFeed();
-               } });
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               viewCurrentFeed();
+                       } });
        }
 }
 
@@ -1034,6 +819,7 @@ function hotkey_handler(e) {
                var keycode;
                var shift_key = false;
 
+               var cmdline = $('cmdline');
                var feedlist = $('feedList');
 
                try {
@@ -1059,7 +845,7 @@ function hotkey_handler(e) {
                } 
 
                if (!hotkeys_enabled) {
-                       debug("hotkeys disabled");
+                       console.log("hotkeys disabled");
                        return;
                }
 
@@ -1068,8 +854,16 @@ function hotkey_handler(e) {
                if ((keycode == 70 || keycode == 67 || keycode == 71) 
                                && !hotkey_prefix) {
 
+                       var date = new Date();
+                       var ts = Math.round(date.getTime() / 1000);
+
                        hotkey_prefix = keycode;
-                       debug("KP: PREFIX=" + keycode + " CHAR=" + keychar);
+                       hotkey_prefix_pressed = ts;
+
+                       cmdline.innerHTML = keychar;
+                       Element.show(cmdline);
+
+                       console.log("KP: PREFIX=" + keycode + " CHAR=" + keychar + " TS=" + ts);
                        return true;
                }
 
@@ -1079,19 +873,10 @@ function hotkey_handler(e) {
 
                /* Global hotkeys */
 
+               Element.hide(cmdline);
+
                if (!hotkey_prefix) {
 
-                       if (keycode == 68 && shift_key) { // d
-                               if (!Element.visible("debug_output")) {
-                                       Element.show("debug_output");
-                                       debug('debug mode activated');
-                               } else {
-                                       Element.hide("debug_output");
-                               }
-       
-                               return;
-                       }
-       
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        //Element.show("hotkey_help_overlay");
@@ -1103,14 +888,17 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 191 || keychar == '/') { // /
-                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat());
+                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
+                                       function() { 
+                                               document.forms['search_form'].query.focus();
+                                       });
                                return false;
                        }
 
-                       if (keycode == 82 && shift_key) { // R
+/*                     if (keycode == 82 && shift_key) { // R
                                scheduleFeedUpdate(true);
                                return;
-                       }
+                       } */
 
                        if (keycode == 74) { // j
                                var feed = getActiveFeedId();
@@ -1164,18 +952,24 @@ function hotkey_handler(e) {
                                return;
                        }
 
+                       if (keycode == 68 && shift_key) { // shift-D
+                               if (isCdmMode()) {
+                                       //cdmDismissArticle(active_post_id);
+                                       cdmDismissSelectedArticles();
+                               }
+                       }
 
                        if (keycode == 78 || keycode == 40) { // n, down
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('next');
-                                       return;
+                                       return false;
                                }
                        }
        
                        if (keycode == 80 || keycode == 38) { // p, up
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('prev');
-                                       return;
+                                       return false;
                                }
                        }
 
@@ -1271,10 +1065,10 @@ function hotkey_handler(e) {
                                return false;
                        }
 
-                       if (keycode == 85 && shift_key) { // U
+/*                     if (keycode == 85 && shift_key) { // U
                                scheduleFeedUpdate(true);
                                return false;
-                       }
+                       } */
 
                        if (keycode == 85) { // u
                                if (getActiveFeedId()) {
@@ -1289,7 +1083,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 83) { // s
-                               displayDlg("quickAddFeed");
+                               quickAddFeed();
                                return false;
                        }
 
@@ -1317,6 +1111,10 @@ function hotkey_handler(e) {
                                return;
                        }
 
+                       if (keycode == 88) { // x
+                               reverseHeadlineOrder();
+                               return;
+                       }
                }
 
                /* Prefix c */
@@ -1325,7 +1123,8 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg("quickAddFilter", getActiveFeedId());
+                               displayDlg('quickAddFilter', '',
+                                  function () {document.forms['filter_add_form'].reg_exp.focus();});
                                return false;
                        }
 
@@ -1411,9 +1210,9 @@ function hotkey_handler(e) {
                }
 
                if (hotkey_prefix) {
-                       debug("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: PREFIX=" + hotkey_prefix + " CODE=" + keycode + " CHAR=" + keychar);
                } else {
-                       debug("KP: CODE=" + keycode + " CHAR=" + keychar);
+                       console.log("KP: CODE=" + keycode + " CHAR=" + keychar);
                }
 
 
@@ -1426,66 +1225,27 @@ function feedsSortByUnread() {
        return feeds_sort_by_unread;
 }
 
-function addLabel() {
-
-       try {
-
-               var caption = prompt(__("Please enter label caption:"), "");
-
-               if (caption != undefined) {
-       
-                       if (caption == "") {
-                               alert(__("Can't create label: missing caption."));
-                               return false;
-                       }
-
-                       var query = "backend.php?op=pref-labels&subop=add&caption=" + 
-                               param_escape(caption);
-
-                       notify_progress("Loading, please wait...", true);
-
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       updateFeedList();
-                       } });
-
-               }
-
-       } catch (e) {
-               exception_error("addLabel", e);
-       }
-}
-
-function visitOfficialSite() {
-       window.open("http://tt-rss.org/");
+function inPreferences() {
+       return false;
 }
 
-
-function feedBrowserSubscribe() {
+function reverseHeadlineOrder() {
        try {
 
-               var selected = getSelectedFeedsFromBrowser();
-
-               if (selected.length > 0) {
-                       closeInfoBox();
-
-                       notify_progress("Loading, please wait...", true);
-
-                       var query =  "backend.php?op=pref-feeds&subop=massSubscribe&ids="+
-                               param_escape(selected.toString());
+               var query_str = "?op=rpc&subop=togglepref&key=REVERSE_HEADLINES";
 
-                       new Ajax.Request(query, {
-                               onComplete: function(transport) { 
-                                       updateFeedList();
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
+                       onComplete: function(transport) { 
+                                       viewCurrentFeed();
                                } });
 
-               } else {
-                       alert(__("No feeds are selected."));
-               }
-
        } catch (e) {
-               exception_error("feedBrowserSubscribe", e);
+               exception_error("reverseHeadlineOrder", e);
        }
 }
 
+function showFeedsWithErrors() {
+       displayDlg('feedUpdateErrors');
+}