]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
use css for help overlay, css cleanup
[tt-rss.git] / tt-rss.js
index 5551dc2d1ba2dd8cf102652af0329203ccd15c7e..321a74c176750bca9f68dbf12b919e5354ff9c11 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -1,24 +1,24 @@
-
 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 _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 _hfd_scrolltop = 0;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
-var init_params = new Object();
-var ver_offset = 0;
-var hor_offset = 0;
-var feeds_sort_by_unread = false;
-var feedlist_sortable_enabled = false;
+var init_params = {};
+var _force_scheduled_update = false;
+var last_scheduled_update = false;
+
+var _rpc_seq = 0;
+
+function next_seq() {
+       _rpc_seq += 1;
+       return _rpc_seq;
+}
+
+function get_seq() {
+       return _rpc_seq;
+}
 
 function activeFeedIsCat() {
        return _active_feed_is_cat;
@@ -35,116 +35,107 @@ function getActiveFeedId() {
 
 function setActiveFeedId(id, is_cat) {
        try {
-               //console.log("sAFID(" + id + ", " + is_cat + ")");
                _active_feed_id = id;
 
                if (is_cat != undefined) {
                        _active_feed_is_cat = is_cat;
                }
 
+               selectFeed(id, is_cat);
+
        } catch (e) {
                exception_error("setActiveFeedId", e);
        }
 }
 
 
-function isFeedlistSortable() {
-       return feedlist_sortable_enabled;
-}
-
-function tagsAreDisplayed() {
-       return display_tags;
-}
-
-function toggleTags(show_all) {
-
+function updateFeedList() {
        try {
 
-       console.log("toggleTags: " + show_all + "; " + display_tags);
-
-       var p = $("dispSwitchPrompt");
-
-       if (!show_all && !display_tags) {
-               displayDlg("printTagCloud");
-       } else if (show_all) {
-               closeInfoBox();
-               display_tags = true;
-               p.innerHTML = __("display feeds");
-               notify_progress("Loading, please wait...", true);
-               updateFeedList();
-       } else if (display_tags) {
-               display_tags = false;
-               p.innerHTML = __("tag cloud");
-               notify_progress("Loading, please wait...", true);
-               updateFeedList();
-       }
-
-       } catch (e) {
-               exception_error("toggleTags", e);
-       }
-}
-
-function dlg_frefresh_callback(transport, deleted_feed) {
-       if (getActiveFeedId() == deleted_feed) {
-               setTimeout("viewfeed(-5)", 100);
-       }
-
-       setTimeout('updateFeedList(false, false)', 50);
-       closeInfoBox();
-}
-
-function scheduleFeedUpdate() {
+//             $("feeds-holder").innerHTML = "<div id=\"feedlistLoading\">" +
+//                     __("Loading, please wait...") + "</div>";
 
-       console.log("in scheduleFeedUpdate");
+               Element.show("feedlistLoading");
 
-       var query_str = "backend.php?op=rpc&subop=updateAllFeeds";
-
-       var omode;
-
-       if (firsttime_update && !navigator.userAgent.match("Opera")) {
-               firsttime_update = false;
-               omode = "T";
-       } else {
-               if (display_tags) {
-                       omode = "tl";
-               } else {
-                       omode = "flc";
+               if (dijit.byId("feedTree")) {
+                       dijit.byId("feedTree").destroyRecursive();
                }
-       }
-       
-       query_str = query_str + "&omode=" + omode;
-       query_str = query_str + "&uctr=" + global_unread;
-
-       console.log("REFETCH query: " + query_str);
 
-       new Ajax.Request("backend.php", {
-               parameters: query_str,
-               onComplete: function(transport) { 
-                               parse_counters_reply(transport, true);
-                       } });
-}
-
-function updateFeedList() {
-       try {
-               console.log("updateFeedList");
-       
-               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();
-               }
-               
-               new Ajax.Request("backend.php", {
-                       parameters: query_str,
-                       onComplete: function(transport) { 
-                               render_feedlist(transport.responseText);
-                       } });
+               var store = new dojo.data.ItemFileWriteStore({
+         url: "backend.php?op=feeds"});
+
+               var treeModel = new fox.FeedStoreModel({
+                       store: store,
+                       query: {
+                               "type": "feed"
+                       },
+                       rootId: "root",
+                       rootLabel: "Feeds",
+                       childrenAttrs: ["items"]
+               });
+
+               var tree = new fox.FeedTree({
+               persist: false,
+               model: treeModel,
+               onOpen: function (item, node) {
+                       var id = String(item.id);
+                       var cat_id = id.substr(id.indexOf(":")+1);
+
+                       new Ajax.Request("backend.php",
+                               { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
+                                       param_escape(cat_id) + "&mode=0" } );
+          },
+               onClose: function (item, node) {
+                       var id = String(item.id);
+                       var cat_id = id.substr(id.indexOf(":")+1);
+
+                       new Ajax.Request("backend.php",
+                               { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
+                                       param_escape(cat_id) + "&mode=1" } );
+
+          },
+               onClick: function (item, node) {
+                       var id = String(item.id);
+                       var is_cat = id.match("^CAT:");
+                       var feed = id.substr(id.indexOf(":")+1);
+                       viewfeed(feed, '', is_cat);
+                       return false;
+               },
+               openOnClick: false,
+               showRoot: false,
+               id: "feedTree",
+               }, "feedTree");
+
+/*             var menu = new dijit.Menu({id: 'feedMenu'});
+
+               menu.addChild(new dijit.MenuItem({
+          label: "Simple menu item"
+               }));
+
+//             menu.bindDomNode(tree.domNode); */
+
+               var tmph = dojo.connect(dijit.byId('feedMenu'), '_openMyself', function (event) {
+                       console.log(dijit.getEnclosingWidget(event.target));
+                       dojo.disconnect(tmph);
+               });
+
+               $("feeds-holder").appendChild(tree.domNode);
+
+               var tmph = dojo.connect(tree, 'onLoad', function() {
+               dojo.disconnect(tmph);
+                       Element.hide("feedlistLoading");
+
+                       tree.collapseHiddenCats();
+
+                       feedlist_init();
+
+//                     var node = dijit.byId("feedTree")._itemNodesMap['FEED:-2'][0].domNode
+//                     menu.bindDomNode(node);
+
+                       loading_set_progress(25);
+               });
+
+               tree.startup();
 
        } catch (e) {
                exception_error("updateFeedList", e);
@@ -161,12 +152,12 @@ function catchupAllFeeds() {
 
                notify_progress("Marking all feeds as read...");
 
-               console.log("catchupAllFeeds Q=" + query_str);
+               //console.log("catchupAllFeeds Q=" + query_str);
 
                new Ajax.Request("backend.php", {
                        parameters: query_str,
-                       onComplete: function(transport) { 
-                               feedlist_callback2(transport); 
+                       onComplete: function(transport) {
+                               feedlist_callback2(transport);
                        } });
 
                global_unread = 0;
@@ -176,67 +167,90 @@ function catchupAllFeeds() {
 
 function viewCurrentFeed(subop) {
 
-//     if (getActiveFeedId()) {
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), subop, activeFeedIsCat());
-       } else {
-//             viewfeed(-1, subop); // FIXME
        }
        return false; // block unneeded form submits
 }
 
-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);
 
-       var refresh_time = getInitParam("feeds_frame_refresh");
+               if (ts - last_scheduled_update > 10 || _force_scheduled_update) {
 
-       if (!refresh_time) refresh_time = 600; 
+                       //console.log("timeout()");
 
-       setTimeout("timeout()", refresh_time*1000);
-}
+                       window.clearTimeout(counter_timeout_id);
 
-function resetSearch() {
-       var searchbox = $("searchbox")
+                       var query_str = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
 
-       if (searchbox.value != "" && getActiveFeedId()) {       
-               searchbox.value = "";
-               viewfeed(getActiveFeedId(), "");
+                       var omode;
+
+                       if (firsttime_update && !navigator.userAgent.match("Opera")) {
+                               firsttime_update = false;
+                               omode = "T";
+                       } else {
+                               omode = "flc";
+                       }
+
+                       query_str = query_str + "&omode=" + omode;
+
+                       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_json(transport, !_force_scheduled_update);
+                                               _force_scheduled_update = false;
+                                       } });
+
+                       last_scheduled_update = ts;
+               }
+
+       } catch (e) {
+               exception_error("timeout", e);
        }
+
+       setTimeout("timeout()", 3000);
 }
 
 function search() {
-       closeInfoBox(); 
-       viewCurrentFeed(0, "");
+       var query = "backend.php?op=dlg&id=search&param=" +
+               param_escape(getActiveFeedId() + ":" + activeFeedIsCat());
+
+       if (dijit.byId("searchDlg"))
+               dijit.byId("searchDlg").destroyRecursive();
+
+       dialog = new dijit.Dialog({
+               id: "searchDlg",
+               title: __("Search"),
+               style: "width: 600px",
+               execute: function() {
+                       if (this.validate()) {
+                               _search_query = dojo.objectToQuery(this.attr('value'));
+                               this.hide();
+                               viewCurrentFeed();
+                       }
+               },
+               href: query});
+
+       dialog.show();
 }
 
-// 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;
@@ -249,35 +263,46 @@ function updateTitle(s) {
 }
 
 function genericSanityCheck() {
-
-//     if (!Ajax.getTransport()) fatalError(1);
-
        setCookie("ttrss_test", "TEST");
-       
+
        if (getCookie("ttrss_test") != "TEST") {
-               fatalError(2);
+               return fatalError(2);
        }
 
        return true;
 }
 
 function init() {
-
        try {
+               dojo.registerModulePath("fox", "../..");
 
-               init_gears();
+               dojo.require("fox.FeedTree");
 
-               Form.disable("main_toolbar_form");
+               if (typeof themeBeforeLayout == 'function') {
+                       themeBeforeLayout();
+               }
 
-               if (!genericSanityCheck()) 
-                       return;
+               dojo.parser.parse();
 
-               var params = "&ua=" + param_escape(navigator.userAgent);
+               dojo.addOnLoad(function() {
+                       updateFeedList();
+                       closeArticlePanel();
 
-               loading_set_progress(30);
+                       if (typeof themeAfterLayout == 'function') {
+                               themeAfterLayout();
+                       }
+
+               });
+
+               if (!genericSanityCheck())
+                       return false;
+
+               loading_set_progress(20);
+
+               var hasAudio = !!((myAudioTag = document.createElement('audio')).canPlayType);
 
                new Ajax.Request("backend.php", {
-                       parameters: "backend.php?op=rpc&subop=sanityCheck" + params,
+                       parameters: {op: "rpc", subop: "sanityCheck", hasAudio: hasAudio},
                        onComplete: function(transport) {
                                        backend_sanity_check_callback(transport);
                                } });
@@ -287,182 +312,79 @@ function init() {
        }
 }
 
-function resize_headlines(delta_x, delta_y) {
-
-       try {
-
-               console.log("resize_headlines: " + delta_x + ":" + delta_y);
-       
-               var h_frame = $("headlines-frame");
-               var c_frame = $("content-frame");
-               var f_frame = $("footer");
-               var feeds_frame = $("feeds-holder");
-               var resize_grab = $("resize-grabber");
-               var resize_handle = $("resize-handle");
-
-               if (!c_frame || !h_frame) return;
-       
-               if (feeds_frame && getInitParam("theme") == "old-skool") {
-                               feeds_frame.style.bottom = f_frame.offsetHeight + "px";         
-               }
-       
-               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) {
-                                       hor_offset = hor_offset + delta_x;
-                               }
-                       }
-       
-                       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";
-       
-                       resize_grab.style.top = (h_frame.offsetTop + h_frame.offsetHeight - 60) + "px";
-                       resize_grab.style.left = (h_frame.offsetLeft + h_frame.offsetWidth - 
-                               4) + "px";
-                       resize_grab.style.display = "block";
-
-                       //resize_handle.src = "themes/"+getInitParam('theme')+"/images/resize_handle_vert.png";
-                       resize_handle.style.paddingTop = (resize_grab.offsetHeight / 2 - 7) + "px";
-       
-               } else {
-       
-                       if (delta_y != undefined) {
-                               if (c_frame.offsetHeight + delta_y > 100 && h_frame.offsetHeight - delta_y > 100) {
-                                       ver_offset = ver_offset + delta_y;
-                               }
-                       }
-       
-                       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";
-
-                       // 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) {
-                       setCookie("ttrss_offset_ver", ver_offset, 
-                               getInitParam("cookie_lifetime"));
-                       setCookie("ttrss_offset_hor", hor_offset, 
-                               getInitParam("cookie_lifetime"));
-               } else {
-                       setCookie("ttrss_offset_ver", ver_offset);
-                       setCookie("ttrss_offset_hor", hor_offset);
-               }
-
-       } catch (e) {
-               exception_error("resize_headlines", e);
-       }
-
-}
-
 function init_second_stage() {
 
        try {
 
                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.order_by, getInitParam("default_view_order_by"));
+               dijit.getEnclosingWidget(toolbar.view_mode).attr('value',
+                       getInitParam("default_view_mode"));
 
-               daemon_enabled = getInitParam("daemon_enabled") == 1;
-               feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
+               dijit.getEnclosingWidget(toolbar.order_by).attr('value',
+                       getInitParam("default_view_order_by"));
 
-/*             var fl = cache_find_param("FEEDLIST", getInitParam("num_feeds"));
+               feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
-               if (fl) {
-                       render_feedlist(fl);
-                       if ($("feedList")) {
-                               request_counters();
-                       } else {
-                               setTimeout('updateFeedList(false, false)', 50);
-                       }
-               } else {
-                       setTimeout('updateFeedList(false, false)', 50);
-               } */
+               loading_set_progress(30);
 
-               setTimeout('updateFeedList(false, false)', 50);
+               // can't use cache_clear() here because viewfeed might not have initialized yet
+               if ('sessionStorage' in window && window['sessionStorage'] !== null)
+                       sessionStorage.clear();
 
                console.log("second stage ok");
 
-               loading_set_progress(60);
-
-               ver_offset = parseInt(getCookie("ttrss_offset_ver"));
-               hor_offset = parseInt(getCookie("ttrss_offset_hor"));
-
-               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;
-
-               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);
        }
 }
 
-function quickMenuChange() {
-       var chooser = $("quickMenuChooser");
-       var opid = chooser[chooser.selectedIndex].value;
-
-       chooser.selectedIndex = 0;
-       quickMenuGo(opid);
-}
-
 function quickMenuGo(opid) {
        try {
-
                if (opid == "qmcPrefs") {
                        gotoPreferences();
                }
-       
+
+               if (opid == "qmcTagCloud") {
+                       displayDlg("printTagCloud");
+               }
+
+               if (opid == "qmcTagSelect") {
+                       displayDlg("printTagSelect");
+               }
+
                if (opid == "qmcSearch") {
-                       displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
-                               function() { 
-                                       document.forms['search_form'].query.focus();
-                               });
+                       search();
                        return;
                }
-       
+
                if (opid == "qmcAddFeed") {
                        quickAddFeed();
                        return;
                }
 
+               if (opid == "qmcDigest") {
+                       window.location.href = "digest.php";
+                       return;
+               }
+
                if (opid == "qmcEditFeed") {
-                       editFeedDlg(getActiveFeedId());
+                       if (activeFeedIsCat())
+                               alert(__("You can't edit this kind of feed."));
+                       else
+                               editFeed(getActiveFeedId());
+                       return;
                }
-       
+
                if (opid == "qmcRemoveFeed") {
                        var actid = getActiveFeedId();
 
                        if (activeFeedIsCat()) {
                                alert(__("You can't unsubscribe from the category."));
                                return;
-                       }       
+                       }
 
                        if (!actid) {
                                alert(__("Please select some feed first."));
@@ -476,36 +398,33 @@ function quickMenuGo(opid) {
                        if (confirm(pr)) {
                                unsubscribeFeed(actid);
                        }
-               
-                       return;
-               }
 
-               if (opid == "qmcUpdateFeeds") {
-                       scheduleFeedUpdate(true);
                        return;
                }
-       
+
                if (opid == "qmcCatchupAll") {
                        catchupAllFeeds();
                        return;
                }
-       
+
                if (opid == "qmcShowOnlyUnread") {
                        toggleDispRead();
                        return;
                }
-       
+
                if (opid == "qmcAddFilter") {
-                       displayDlg('quickAddFilter', '',
-                          function () {document.forms['filter_add_form'].reg_exp.focus();});
+                       quickAddFilter();
+                       return;
                }
 
                if (opid == "qmcAddLabel") {
                        addLabel();
+                       return;
                }
 
                if (opid == "qmcRescoreFeed") {
                        rescoreCurrentFeed();
+                       return;
                }
 
                if (opid == "qmcHKhelp") {
@@ -513,38 +432,14 @@ function quickMenuGo(opid) {
                        Effect.Appear("hotkey_help_overlay", {duration : 0.3});
                }
 
-               if (opid == "qmcResetUI") {
-                       hor_offset = 0;
-                       ver_offset = 0;
-                       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 = "?op=feeds&subop=catsortreset";
+               if (opid == "qmcAbout") {
+                       dialog = new dijit.Dialog({
+                               title: __("About..."),
+                               style: "width: 400px",
+                               href: "backend.php?op=dlg&id=about",
+                       });
 
-                               notify_progress("Loading, please wait...", true);
-
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) { 
-                                               window.setTimeout('updateFeedList(false, false)', 50);
-                                       } });
-                       }
+                       dialog.show();
                }
 
        } catch (e) {
@@ -552,11 +447,6 @@ function quickMenuGo(opid) {
        }
 }
 
-function updateFeedTitle(t) {
-       active_title_text = t;
-       updateTitle();
-}
-
 function toggleDispRead() {
        try {
 
@@ -564,38 +454,29 @@ function toggleDispRead() {
 
                hideOrShowFeeds(hide);
 
-               var query = "?op=rpc&subop=setpref&key=HIDE_READ_FEEDS&value=" + 
+               var query = "?op=rpc&subop=setpref&key=HIDE_READ_FEEDS&value=" +
                        param_escape(hide);
 
+               setInitParam("hide_read_feeds", hide);
+
                new Ajax.Request("backend.php", {
                        parameters: query,
-                       onComplete: function(transport) { 
-                               setInitParam("hide_read_feeds", hide);
+                       onComplete: function(transport) {
                        } });
-                               
+
        } catch (e) {
                exception_error("toggleDispRead", e);
        }
 }
 
-function parse_runtime_info(elem) {
-
-       if (!elem || !elem.firstChild) {
-               return;
-       }
-
-       var data = JSON.parse(elem.firstChild.nodeValue);
+function parse_runtime_info(data) {
 
-       console.log("parsing runtime info...");
+       //console.log("parsing runtime info...");
 
        for (k in data) {
                var v = data[k];
 
-               console.log("RI: " + k + " => " + v);
-
-               if (k == "num_feeds") {
-                       init_params[k] = v;                                     
-               }
+//             console.log("RI: " + k + " => " + v);
 
                if (k == "new_version_available") {
                        var icon = $("newVersionIcon");
@@ -606,31 +487,37 @@ 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;
+                       return;
                }
 
-               if (!error_flag) {
-                       notify('');
-               } 
+               if (k == "max_feed_id" || k == "num_feeds") {
+                       if (init_params[k] != v) {
+                               console.log("feed count changed, need to reload feedlist.");
+                               updateFeedList();
+                       }
+               }
 
+               init_params[k] = v;
+               notify('');
        }
 }
 
 function catchupCurrentFeed() {
 
        var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
-       
+
        var str = __("Mark all articles in %s as read?").replace("%s", fn);
 
        if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
@@ -655,153 +542,35 @@ function catchupFeedInGroup(id) {
        }
 }
 
-function editFeedDlg(feed) {
-       try {
-
-               if (!feed) {
-                       alert(__("Please select some feed first."));
-                       return;
-               }
-       
-               if ((feed <= 0) || activeFeedIsCat() || tagsAreDisplayed()) {
-                       alert(__("You can't edit this kind of feed."));
-                       return;
-               }
-       
-               var query = "";
-       
-               if (feed > 0) {
-                       query = "?op=pref-feeds&subop=editfeed&id=" +   param_escape(feed);
-               } else {
-                       query = "?op=pref-labels&subop=edit&id=" +      param_escape(-feed-11);
-               }
-
-               disableHotkeys();
-
-               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) {
-               exception_error("editFeedDlg", e);
-       }
-}
-
-/* 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 {
-       
-               // FIXME: add parameter validation
-
-               var query = Form.serialize("edit_feed_form");
-
-               notify_progress("Saving feed...");
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-                               dlg_frefresh_callback(transport); 
-                       } });
-
-               cache_flush();
-               closeInfoBox();
-
-               return false;
-
-       } catch (e) {
-               exception_error("feedEditSave (main)", e);
-       } 
-}
-
 function collapse_feedlist() {
        try {
-               console.log("collapse_feedlist");
-               
-               var theme = getInitParam("theme");
-               if (theme != "" && 
-                               !getInitParam("theme_options").match("collapse_feedlist")) return;
-
-               var fl = $("feeds-holder");
-               var fh = $("headlines-frame");
-               var fc = $("content-frame");
-               var ft = $("toolbar");
-               var ff = $("footer");
-               var fhdr = $("header");
-               var fbtn = $("collapse_feeds_btn");
-
-               if (!Element.visible(fl)) {
-                       Element.show(fl);
-                       fbtn.innerHTML = "&lt;&lt;";
-
-                       if (theme != "graycube") {
-
-                               fh.style.left = fl.offsetWidth + "px";
-                               ft.style.left = fl.offsetWidth + "px";
-                               if (fc) fc.style.left = fl.offsetWidth + "px";
-                               if (ff && theme != "compat") ff.style.left = (fl.offsetWidth-1) + "px";
-
-                               if (theme == "compact") fhdr.style.left = (fl.offsetWidth + 10) + "px";
-                       } else {
-                               fh.style.left = fl.offsetWidth + 40 + "px";
-                               ft.style.left = fl.offsetWidth + 40 +"px";
-                               if (fc) fc.style.left = fl.offsetWidth + 40 + "px";
-                       }
-
-                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=false";
-
-                       new Ajax.Request("backend.php", { parameters: query });
 
+               if (!Element.visible('feeds-holder')) {
+                       Element.show('feeds-holder');
+                       Element.show('feeds-holder_splitter');
+                       $("collapse_feeds_btn").innerHTML = "&lt;&lt;";
                } else {
-                       Element.hide(fl);
-                       fbtn.innerHTML = "&gt;&gt;";
-
-                       if (theme != "graycube") {
-
-                               fh.style.left = "0px";
-                               ft.style.left = "0px";
-                               if (fc) fc.style.left = "0px";
-                               if (ff) ff.style.left = "0px";
-
-                               if (theme == "compact") fhdr.style.left = "10px";
-
-                       } else {
-                               fh.style.left = "20px";
-                               ft.style.left = "20px";
-                               if (fc) fc.style.left = "20px";
-
-                       }
+                       Element.hide('feeds-holder');
+                       Element.hide('feeds-holder_splitter');
+                       $("collapse_feeds_btn").innerHTML = "&gt;&gt;";
+               }
 
-                       query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=true";
+               dijit.byId("main").resize();
 
-                       new Ajax.Request("backend.php", { parameters: query });
+               query = "?op=rpc&subop=setpref&key=_COLLAPSED_FEEDLIST&value=true";
+               new Ajax.Request("backend.php", { parameters: query });
 
-               }
        } catch (e) {
                exception_error("collapse_feedlist", e);
        }
 }
 
 function viewModeChanged() {
-       cache_flush();
-       return viewCurrentFeed(0, '')
+       return viewCurrentFeed('')
 }
 
 function viewLimitChanged() {
-       cache_flush();
-       return viewCurrentFeed(0, '')
+       return viewCurrentFeed('')
 }
 
 /* function adjustArticleScore(id, score) {
@@ -828,10 +597,10 @@ function rescoreCurrentFeed() {
 
        var actid = getActiveFeedId();
 
-       if (activeFeedIsCat() || actid < 0 || tagsAreDisplayed()) {
+       if (activeFeedIsCat() || actid < 0) {
                alert(__("You can't rescore this kind of feed."));
                return;
-       }       
+       }
 
        if (!actid) {
                alert(__("Please select some feed first."));
@@ -855,21 +624,21 @@ function rescoreCurrentFeed() {
 }
 
 function hotkey_handler(e) {
-
        try {
 
+               if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
+
                var keycode;
                var shift_key = false;
 
                var cmdline = $('cmdline');
-               var feedlist = $('feedList');
 
                try {
                        shift_key = e.shiftKey;
                } catch (e) {
 
                }
-       
+
                if (window.event) {
                        keycode = window.event.keyCode;
                } else if (e) {
@@ -883,17 +652,12 @@ function hotkey_handler(e) {
                                Element.hide("hotkey_help_overlay");
                        }
                        hotkey_prefix = false;
-                       closeInfoBox();
-               } 
-
-               if (!hotkeys_enabled) {
-                       console.log("hotkeys disabled");
-                       return;
                }
 
                if (keycode == 16) return; // ignore lone shift
+               if (keycode == 17) return; // ignore lone ctrl
 
-               if ((keycode == 70 || keycode == 67 || keycode == 71
+               if ((keycode == 70 || keycode == 67 || keycode == 71 || keycode == 65)
                                && !hotkey_prefix) {
 
                        var date = new Date();
@@ -919,10 +683,19 @@ function hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
+                       if (keycode == 27) { // escape
+                               closeArticlePanel();
+                               return;
+                       }
+
+                       if (keycode == 69) { // e
+                               var id = getActiveArticleId();
+                               emailArticle(id);
+                       }
+
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
-                                       //Element.show("hotkey_help_overlay");
-                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3});
+                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3, to : 0.9});
                                } else {
                                        Element.hide("hotkey_help_overlay");
                                }
@@ -930,47 +703,25 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 191 || keychar == '/') { // /
-                               displayDlg("search", getActiveFeedId() + ":" + activeFeedIsCat(), 
-                                       function() { 
-                                               document.forms['search_form'].query.focus();
-                                       });
+                               search();
                                return false;
                        }
 
-                       if (keycode == 82 && shift_key) { // R
-                               scheduleFeedUpdate(true);
-                               return;
-                       }
+                       if (keycode == 74 && !shift_key) { // j
+                               var rv = dijit.byId("feedTree").getPreviousFeed(
+                                               getActiveFeedId(), activeFeedIsCat());
+
+                               if (rv) viewfeed(rv[0], '', rv[1]);
 
-                       if (keycode == 74) { // j
-                               var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'prev');
-//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
-                               if (new_feed) {
-                                       var is_cat = new_feed.match("CAT:");
-                                       if (is_cat) {
-                                               new_feed = new_feed.replace("CAT:", "");
-                                               viewCategory(new_feed);
-                                       } else {
-                                               viewfeed(new_feed, '', false);
-                                       }
-                               }
                                return;
                        }
-       
+
                        if (keycode == 75) { // k
-                               var feed = getActiveFeedId();
-                               var new_feed = getRelativeFeedId2(feed, activeFeedIsCat(), 'next');
-//                             alert(feed + " IC: " + activeFeedIsCat() + " => " + new_feed);
-                               if (new_feed) {
-                                       var is_cat = new_feed.match("CAT:");
-                                       if (is_cat == "CAT:") {
-                                               new_feed = new_feed.replace("CAT:", "");
-                                               viewCategory(new_feed);
-                                       } else {
-                                               viewfeed(new_feed, '', false);
-                                       }
-                               }
+                               var rv = dijit.byId("feedTree").getNextFeed(
+                                               getActiveFeedId(), activeFeedIsCat());
+
+                               if (rv) viewfeed(rv[0], '', rv[1]);
+
                                return;
                        }
 
@@ -985,20 +736,23 @@ function hotkey_handler(e) {
                        }
 
                        if (shift_key && keycode == 78) { // N
-                               scrollArticle(50);      
+                               scrollArticle(50);
                                return;
                        }
 
                        if (shift_key && keycode == 80) { // P
-                               scrollArticle(-50);     
+                               scrollArticle(-50);
                                return;
                        }
 
                        if (keycode == 68 && shift_key) { // shift-D
-                               if (isCdmMode()) {
-                                       //cdmDismissArticle(active_post_id);
-                                       cdmDismissSelectedArticles();
-                               }
+                               dismissSelectedArticles();
+                               return;
+                       }
+
+                       if (keycode == 88 && shift_key) { // shift-X
+                               dismissReadArticles();
+                               return;
                        }
 
                        if (keycode == 78 || keycode == 40) { // n, down
@@ -1007,7 +761,7 @@ function hotkey_handler(e) {
                                        return false;
                                }
                        }
-       
+
                        if (keycode == 80 || keycode == 38) { // p, up
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('prev');
@@ -1016,27 +770,17 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 83 && shift_key) { // S
-                               var id = getActiveArticleId();
-                               if (id) {                               
-                                       togglePub(id);
-                               }
+                               selectionTogglePublished(undefined, false, true);
                                return;
                        }
 
                        if (keycode == 83) { // s
-                               var id = getActiveArticleId();
-                               if (id) {                               
-                                       toggleMark(id);
-                               }
+                               selectionToggleMarked(undefined, false, true);
                                return;
                        }
 
-
                        if (keycode == 85) { // u
-                               var id = getActiveArticleId();
-                               if (id) {                               
-                                       toggleUnread(id);
-                               }
+                               selectionToggleUnread(undefined, false, true)
                                return;
                        }
 
@@ -1050,7 +794,7 @@ function hotkey_handler(e) {
 
                        if (keycode == 9) { // tab
                                var id = getArticleUnderPointer();
-                               if (id) {                               
+                               if (id) {
                                        var cb = $("RCHK-" + id);
 
                                        if (cb) {
@@ -1075,16 +819,44 @@ function hotkey_handler(e) {
                                }
                        }
 
-                       if (keycode == 88) { // x
+                       if (keycode == 88 && !shift_key) { // x
                                if (activeFeedIsCat()) {
-                                       toggleCollapseCat(getActiveFeedId());
+                                       dijit.byId("feedTree").collapseCat(getActiveFeedId());
+                                       return;
                                }
                        }
                }
 
+               /* Prefix a */
+
+               if (hotkey_prefix == 65) { // a
+                       hotkey_prefix = false;
+
+                       if (keycode == 65) { // a
+                               selectArticles('all');
+                               return;
+                       }
+
+                       if (keycode == 85) { // u
+                               selectArticles('unread');
+                               return;
+                       }
+
+                       if (keycode == 73) { // i
+                               selectArticles('invert');
+                               return;
+                       }
+
+                       if (keycode == 78) { // n
+                               selectArticles('none');
+                               return;
+                       }
+
+               }
+
                /* Prefix f */
 
-               if (hotkey_prefix == 70) { // f 
+               if (hotkey_prefix == 70) { // f
 
                        hotkey_prefix = false;
 
@@ -1097,7 +869,7 @@ function hotkey_handler(e) {
 
                        if (keycode == 82) { // r
                                if (getActiveFeedId()) {
-                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+                                       viewfeed(getActiveFeedId(), '', activeFeedIsCat());
                                        return;
                                }
                        }
@@ -1107,20 +879,21 @@ function hotkey_handler(e) {
                                return false;
                        }
 
-                       if (keycode == 85 && shift_key) { // U
-                               scheduleFeedUpdate(true);
-                               return false;
-                       }
-
                        if (keycode == 85) { // u
                                if (getActiveFeedId()) {
-                                       viewfeed(getActiveFeedId(), "ForceUpdate");
+                                       viewfeed(getActiveFeedId(), '');
                                        return false;
                                }
                        }
 
                        if (keycode == 69) { // e
-                               editFeedDlg(getActiveFeedId());
+
+                               if (activeFeedIsCat())
+                                       alert(__("You can't edit this kind of feed."));
+                               else
+                                       editFeed(getActiveFeedId());
+                               return;
+
                                return false;
                        }
 
@@ -1148,11 +921,6 @@ function hotkey_handler(e) {
                                return resort_feedlist();
                        }
 
-                       if (keycode == 72) { // h
-                               hideReadHeadlines();
-                               return;
-                       }
-
                        if (keycode == 88) { // x
                                reverseHeadlineOrder();
                                return;
@@ -1165,8 +933,7 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 70) { // f
-                               displayDlg('quickAddFilter', '',
-                                  function () {document.forms['filter_add_form'].reg_exp.focus();});
+                               quickAddFilter();
                                return false;
                        }
 
@@ -1183,14 +950,8 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 77) { // m
-                               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);
-                               }
+                               // TODO: sortable feedlist
+                               return;
                        }
 
                        if (keycode == 78) { // n
@@ -1238,15 +999,15 @@ function hotkey_handler(e) {
                                return false;
                        }
 
-                       if (keycode == 84 && shift_key) { // T
-                               toggleTags();
+                       if (keycode == 84) { // t
+                               displayDlg("printTagCloud");
                                return false;
                        }
                }
 
                /* Cmd */
 
-               if (hotkey_prefix == 224 || hotkey_prefix == 91) { // f 
+               if (hotkey_prefix == 224 || hotkey_prefix == 91) { // f
                        hotkey_prefix = false;
                        return;
                }
@@ -1263,10 +1024,6 @@ function hotkey_handler(e) {
        }
 }
 
-function feedsSortByUnread() {
-       return feeds_sort_by_unread;
-}
-
 function inPreferences() {
        return false;
 }
@@ -1278,7 +1035,7 @@ function reverseHeadlineOrder() {
 
                new Ajax.Request("backend.php", {
                        parameters: query_str,
-                       onComplete: function(transport) { 
+                       onComplete: function(transport) {
                                        viewCurrentFeed();
                                } });
 
@@ -1287,7 +1044,128 @@ function reverseHeadlineOrder() {
        }
 }
 
-function showFeedsWithErrors() {
-       displayDlg('feedUpdateErrors');
+function scheduleFeedUpdate(id, is_cat) {
+       try {
+               if (!id) {
+                       id = getActiveFeedId();
+                       is_cat = activeFeedIsCat();
+               }
+
+               if (!id) {
+                       alert(__("Please select some feed first."));
+                       return;
+               }
+
+               var query = "?op=rpc&subop=scheduleFeedUpdate&id=" +
+                       param_escape(id) +
+                       "&is_cat=" + param_escape(is_cat);
+
+               console.log(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               handle_rpc_json(transport);
+
+                               var reply = JSON.parse(transport.responseText);
+                               var message = reply['message'];
+
+                               if (message) {
+                                       notify_info(message);
+                                       return;
+                               }
+
+                       } });
+
+
+       } catch (e) {
+               exception_error("scheduleFeedUpdate", e);
+       }
+}
+
+function newVersionDlg() {
+       try {
+               var query = "backend.php?op=dlg&id=newVersion";
+
+               if (dijit.byId("newVersionDlg"))
+                       dijit.byId("newVersionDlg").destroyRecursive();
+
+               dialog = new dijit.Dialog({
+                       id: "newVersionDlg",
+                       title: __("New version available!"),
+                       style: "width: 600px",
+                       href: query,
+               });
+
+               dialog.show();
+
+       } catch (e) {
+               exception_error("newVersionDlg", e);
+       }
+}
+
+function handle_rpc_json(transport, scheduled_call) {
+       try {
+               var reply = JSON.parse(transport.responseText);
+
+               if (reply) {
+
+                       var error = reply['error'];
+
+                       if (error) {
+                               var code = error['code'];
+                               var msg = error['msg'];
+
+                               console.warn("[handle_rpc_json] received fatal error " + code + "/" + msg);
+
+                               if (code != 0) {
+                                       fatalError(code, msg);
+                                       return false;
+                               }
+                       }
+
+                       var seq = reply['seq'];
+
+                       if (seq) {
+                               if (get_seq() != seq) {
+                                       console.log("[handle_rpc_json] sequence mismatch: " + seq +
+                                               " (want: " + get_seq() + ")");
+                                       return true;
+                               }
+                       }
+
+                       var message = reply['message'];
+
+                       if (message) {
+                               if (message == "UPDATE_COUNTERS") {
+                                       console.log("need to refresh counters...");
+                                       setInitParam("last_article_id", -1);
+                                       _force_scheduled_update = true;
+                               }
+                       }
+
+                       var counters = reply['counters'];
+
+                       if (counters)
+                               parse_counters(counters, scheduled_call);
+
+                       var runtime_info = reply['runtime-info'];;
+
+                       if (runtime_info)
+                               parse_runtime_info(runtime_info);
+
+                       hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
+
+               } else {
+                       notify_error("Error communicating with server.");
+               }
+
+       } catch (e) {
+               notify_error("Error communicating with server.");
+               console.log(e);
+               //exception_error("handle_rpc_json", e, transport);
+       }
+
+       return true;
 }