]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
use css for help overlay, css cleanup
[tt-rss.git] / tt-rss.js
index bf963d6ea4ec5c657c4d5e40ca4d0fa2d7721a86..321a74c176750bca9f68dbf12b919e5354ff9c11 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -3,13 +3,11 @@ var global_unread = -1;
 var firsttime_update = true;
 var _active_feed_id = 0;
 var _active_feed_is_cat = false;
-var number_of_feeds = 0;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
 var init_params = {};
 var _force_scheduled_update = false;
 var last_scheduled_update = false;
-var treeModel;
 
 var _rpc_seq = 0;
 
@@ -51,27 +49,10 @@ function setActiveFeedId(id, is_cat) {
 }
 
 
-function isFeedlistSortable() {
-       return feedlist_sortable_enabled;
-}
-
-function tagsAreDisplayed() {
-       return false;
-}
-
-function dlg_frefresh_callback(transport, deleted_feed) {
-       if (getActiveFeedId() == deleted_feed) {
-               setTimeout("viewfeed(-5)", 100);
-       }
-
-       setTimeout('updateFeedList()', 50);
-       closeInfoBox();
-}
-
 function updateFeedList() {
        try {
 
-//             $("feeds-holder").innerHTML = "<div id=\"feedlistLoading\">" + 
+//             $("feeds-holder").innerHTML = "<div id=\"feedlistLoading\">" +
 //                     __("Loading, please wait...") + "</div>";
 
                Element.show("feedlistLoading");
@@ -83,7 +64,7 @@ function updateFeedList() {
                var store = new dojo.data.ItemFileWriteStore({
          url: "backend.php?op=feeds"});
 
-               treeModel = new dijit.tree.ForestStoreModel({
+               var treeModel = new fox.FeedStoreModel({
                        store: store,
                        query: {
                                "type": "feed"
@@ -93,49 +74,24 @@ function updateFeedList() {
                        childrenAttrs: ["items"]
                });
 
-               var tree = new dijit.Tree({
+               var tree = new fox.FeedTree({
+               persist: false,
                model: treeModel,
-               _createTreeNode: function(args) {
-                       var tnode = new dijit._TreeNode(args);
-
-                       if (args.item.icon)
-                               tnode.iconNode.src = args.item.icon[0];
-
-                       //tnode.labelNode.innerHTML = args.label;
-                       return tnode;
-                       },
-               getIconClass: function (item, opened) {
-                       return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "feedIcon";
-               },
-               getLabelClass: function (item, opened) {
-                       return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
-               },
-               getRowClass: function (item, opened) {
-                       return (!item.error || item.error == '') ? "dijitTreeRow" : 
-                               "dijitTreeRow Error";
-               },
-               getLabel: function(item) {
-                       if (item.unread > 0) {
-                               return item.name + " (" + item.unread + ")";
-                       } else {
-                               return item.name;
-                       }
-               },
                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=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=0" } );
+                       new Ajax.Request("backend.php",
+                               { parameters: "backend.php?op=feeds&subop=collapse&cid=" +
+                                       param_escape(cat_id) + "&mode=1" } );
 
           },
                onClick: function (item, node) {
@@ -150,11 +106,33 @@ function updateFeedList() {
                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();
@@ -178,8 +156,8 @@ function catchupAllFeeds() {
 
                new Ajax.Request("backend.php", {
                        parameters: query_str,
-                       onComplete: function(transport) { 
-                               feedlist_callback2(transport); 
+                       onComplete: function(transport) {
+                               feedlist_callback2(transport);
                        } });
 
                global_unread = 0;
@@ -207,29 +185,29 @@ function timeout() {
                        //console.log("timeout()");
 
                        window.clearTimeout(counter_timeout_id);
-               
+
                        var query_str = "?op=rpc&subop=getAllCounters&seq=" + next_seq();
-               
+
                        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_reply(transport, !_force_scheduled_update);
+                               onComplete: function(transport) {
+                                               handle_rpc_json(transport, !_force_scheduled_update);
                                                _force_scheduled_update = false;
                                        } });
 
@@ -244,8 +222,26 @@ function timeout() {
 }
 
 function search() {
-       closeInfoBox(); 
-       viewCurrentFeed();
+       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();
 }
 
 function updateTitle() {
@@ -268,9 +264,9 @@ function updateTitle() {
 
 function genericSanityCheck() {
        setCookie("ttrss_test", "TEST");
-       
+
        if (getCookie("ttrss_test") != "TEST") {
-               fatalError(2);
+               return fatalError(2);
        }
 
        return true;
@@ -278,32 +274,35 @@ function genericSanityCheck() {
 
 function init() {
        try {
-               Form.disable("main_toolbar_form");
-
-               dojo.require("dijit.layout.BorderContainer");
-               dojo.require("dijit.layout.TabContainer");
-               dojo.require("dijit.layout.ContentPane");
-               dojo.require("dijit.Dialog");
-               dojo.require("dijit.form.Button");
-               dojo.require("dojo.data.ItemFileWriteStore");
-               dojo.require("dijit.Tree");
-               dojo.require("dijit.form.Select");
-               dojo.require("dojo.parser");
+               dojo.registerModulePath("fox", "../..");
+
+               dojo.require("fox.FeedTree");
+
+               if (typeof themeBeforeLayout == 'function') {
+                       themeBeforeLayout();
+               }
+
+               dojo.parser.parse();
 
                dojo.addOnLoad(function() {
                        updateFeedList();
                        closeArticlePanel();
+
+                       if (typeof themeAfterLayout == 'function') {
+                               themeAfterLayout();
+                       }
+
                });
 
-               if (!genericSanityCheck()) 
-                       return;
+               if (!genericSanityCheck())
+                       return false;
 
-               var params = "&ua=" + param_escape(navigator.userAgent);
+               loading_set_progress(20);
 
-               loading_set_progress(30);
+               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);
                                } });
@@ -321,18 +320,19 @@ function init_second_stage() {
 
                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"));
 
-               feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
+               dijit.getEnclosingWidget(toolbar.order_by).attr('value',
+                       getInitParam("default_view_order_by"));
 
-               loading_set_progress(60);
+               feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
-               if (has_local_storage())
-                       localStorage.clear();
+               loading_set_progress(30);
 
-               feedlist_init();
-               setTimeout("timeout()", 3000);
+               // 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");
 
@@ -341,49 +341,50 @@ function init_second_stage() {
        }
 }
 
-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."));
@@ -397,7 +398,7 @@ function quickMenuGo(opid) {
                        if (confirm(pr)) {
                                unsubscribeFeed(actid);
                        }
-               
+
                        return;
                }
 
@@ -405,23 +406,25 @@ function quickMenuGo(opid) {
                        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") {
@@ -429,36 +432,14 @@ function quickMenuGo(opid) {
                        Effect.Appear("hotkey_help_overlay", {duration : 0.3});
                }
 
-               if (opid == "qmcResetUI") {
-                       alert("Function not implemented");
-               }
-
-/*             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()', 50);
-                                       } });
-                       }
+                       dialog.show();
                }
 
        } catch (e) {
@@ -473,35 +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) {
-               console.warn("parse_runtime_info: invalid node passed");
-               return;
-       }
-
-       var data = JSON.parse(elem.firstChild.nodeValue);
+function parse_runtime_info(data) {
 
        //console.log("parsing runtime info...");
 
        for (k in data) {
                var v = data[k];
 
-               // console.log("RI: " + k + " => " + v);
+//             console.log("RI: " + k + " => " + v);
 
                if (k == "new_version_available") {
                        var icon = $("newVersionIcon");
@@ -527,7 +502,14 @@ function parse_runtime_info(elem) {
                        return;
                }
 
-               init_params[k] = v;                                     
+               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('');
        }
 }
@@ -535,7 +517,7 @@ function parse_runtime_info(elem) {
 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)) {
@@ -560,85 +542,16 @@ function catchupFeedInGroup(id) {
        }
 }
 
-function editFeedDlg(feed) {
-       try {
-
-               if (!feed) {
-                       alert(__("Please select some feed first."));
-                       return;
-               }
-       
-               if ((feed <= 0) || activeFeedIsCat()) {
-                       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 {
 
                if (!Element.visible('feeds-holder')) {
                        Element.show('feeds-holder');
+                       Element.show('feeds-holder_splitter');
                        $("collapse_feeds_btn").innerHTML = "&lt;&lt;";
                } else {
                        Element.hide('feeds-holder');
+                       Element.hide('feeds-holder_splitter');
                        $("collapse_feeds_btn").innerHTML = "&gt;&gt;";
                }
 
@@ -653,12 +566,10 @@ function collapse_feedlist() {
 }
 
 function viewModeChanged() {
-       cache_flush();
        return viewCurrentFeed('')
 }
 
 function viewLimitChanged() {
-       cache_flush();
        return viewCurrentFeed('')
 }
 
@@ -689,7 +600,7 @@ function rescoreCurrentFeed() {
        if (activeFeedIsCat() || actid < 0) {
                alert(__("You can't rescore this kind of feed."));
                return;
-       }       
+       }
 
        if (!actid) {
                alert(__("Please select some feed first."));
@@ -713,9 +624,10 @@ function rescoreCurrentFeed() {
 }
 
 function hotkey_handler(e) {
-
        try {
 
+               if (e.target.nodeName == "INPUT" || e.target.nodeName == "TEXTAREA") return;
+
                var keycode;
                var shift_key = false;
 
@@ -726,7 +638,7 @@ function hotkey_handler(e) {
                } catch (e) {
 
                }
-       
+
                if (window.event) {
                        keycode = window.event.keyCode;
                } else if (e) {
@@ -740,18 +652,12 @@ function hotkey_handler(e) {
                                Element.hide("hotkey_help_overlay");
                        }
                        hotkey_prefix = false;
-                       closeInfoBox();
-               } 
-
-               if (dialogs.length > 0 || !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();
@@ -777,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");
                                }
@@ -788,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) { // 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);
-                                       }
-                               }
+                       if (keycode == 74 && !shift_key) { // j
+                               var rv = dijit.byId("feedTree").getPreviousFeed(
+                                               getActiveFeedId(), activeFeedIsCat());
+
+                               if (rv) viewfeed(rv[0], '', rv[1]);
+
                                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;
                        }
 
@@ -843,21 +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
                                dismissSelectedArticles();
+                               return;
                        }
 
                        if (keycode == 88 && shift_key) { // shift-X
                                dismissReadArticles();
+                               return;
                        }
 
                        if (keycode == 78 || keycode == 40) { // n, down
@@ -866,7 +761,7 @@ function hotkey_handler(e) {
                                        return false;
                                }
                        }
-       
+
                        if (keycode == 80 || keycode == 38) { // p, up
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('prev');
@@ -884,7 +779,6 @@ function hotkey_handler(e) {
                                return;
                        }
 
-
                        if (keycode == 85) { // u
                                selectionToggleUnread(undefined, false, true)
                                return;
@@ -900,7 +794,7 @@ function hotkey_handler(e) {
 
                        if (keycode == 9) { // tab
                                var id = getArticleUnderPointer();
-                               if (id) {                               
+                               if (id) {
                                        var cb = $("RCHK-" + id);
 
                                        if (cb) {
@@ -925,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;
 
@@ -947,7 +869,7 @@ function hotkey_handler(e) {
 
                        if (keycode == 82) { // r
                                if (getActiveFeedId()) {
-                                       viewfeed(getActiveFeedId(), "ForceUpdate", activeFeedIsCat());
+                                       viewfeed(getActiveFeedId(), '', activeFeedIsCat());
                                        return;
                                }
                        }
@@ -957,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;
                        }
 
@@ -1010,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;
                        }
 
@@ -1028,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
@@ -1083,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;
                }
@@ -1119,7 +1035,7 @@ function reverseHeadlineOrder() {
 
                new Ajax.Request("backend.php", {
                        parameters: query_str,
-                       onComplete: function(transport) { 
+                       onComplete: function(transport) {
                                        viewCurrentFeed();
                                } });
 
@@ -1128,32 +1044,99 @@ 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_reply(transport, scheduled_call) {
+function handle_rpc_json(transport, scheduled_call) {
        try {
-               if (transport.responseXML) {
+               var reply = JSON.parse(transport.responseText);
 
-                       if (!transport_error_check(transport)) return false;
+               if (reply) {
 
-                       var seq = transport.responseXML.getElementsByTagName("seq")[0];
+                       var error = reply['error'];
 
-                       if (seq) {
-                               seq = seq.firstChild.nodeValue;
+                       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_reply] sequence mismatch: " + seq);
+                                       console.log("[handle_rpc_json] sequence mismatch: " + seq +
+                                               " (want: " + get_seq() + ")");
                                        return true;
                                }
                        }
 
-                       var message = transport.responseXML.getElementsByTagName("message")[0];
+                       var message = reply['message'];
 
                        if (message) {
-                               message = message.firstChild.nodeValue;
-
                                if (message == "UPDATE_COUNTERS") {
                                        console.log("need to refresh counters...");
                                        setInitParam("last_article_id", -1);
@@ -1161,19 +1144,16 @@ function handle_rpc_reply(transport, scheduled_call) {
                                }
                        }
 
-                       var counters = transport.responseXML.getElementsByTagName("counters")[0];
-       
+                       var counters = reply['counters'];
+
                        if (counters)
                                parse_counters(counters, scheduled_call);
 
-                       var runtime_info = transport.responseXML.getElementsByTagName("runtime-info")[0];
+                       var runtime_info = reply['runtime-info'];;
 
                        if (runtime_info)
                                parse_runtime_info(runtime_info);
 
-                       if (feedsSortByUnread())
-                               resort_feedlist();
-
                        hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
 
                } else {
@@ -1181,45 +1161,11 @@ function handle_rpc_reply(transport, scheduled_call) {
                }
 
        } catch (e) {
-               exception_error("handle_rpc_reply", e, transport);
+               notify_error("Error communicating with server.");
+               console.log(e);
+               //exception_error("handle_rpc_json", e, transport);
        }
 
        return true;
 }
 
-function scheduleFeedUpdate() {
-       try {
-
-               if (!getActiveFeedId()) {
-                       alert(__("Please select some feed first."));
-                       return;
-               }
-
-               var query = "?op=rpc&subop=scheduleFeedUpdate&id=" + 
-                       param_escape(getActiveFeedId()) +
-                       "&is_cat=" + param_escape(activeFeedIsCat());
-
-               console.log(query);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-
-                               if (transport.responseXML) {
-                                       var message = transport.responseXML.getElementsByTagName("message")[0];
-
-                                       if (message) {
-                                               notify_info(message.firstChild.nodeValue);
-                                               return;
-                                       }
-                               }
-
-                               notify_error("Error communicating with server.");
-
-                       } });
-
-
-       } catch (e) {
-               exception_error("scheduleFeedUpdate", e);
-       }
-}