]> git.wh0rd.org - tt-rss.git/blobdiff - js/tt-rss.js
catch plugin JS errors
[tt-rss.git] / js / tt-rss.js
index ae5815b68de0f41f6054184e969804660af92344..78feb6ea32f22ce53ccb788a140f2801b8df4f53 100644 (file)
@@ -40,6 +40,8 @@ function setActiveFeedId(id, is_cat) {
                $("headlines-frame").setAttribute("is-cat", is_cat ? 1 : 0);
 
                selectFeed(id, is_cat);
+
+               PluginHost.run(PluginHost.HOOK_FEED_SET_ACTIVE, _active_article_id);
        } catch (e) {
                exception_error("setActiveFeedId", e);
        }
@@ -77,7 +79,7 @@ function updateFeedList() {
                        var id = String(item.id);
                        var is_cat = id.match("^CAT:");
                        var feed = id.substr(id.indexOf(":")+1);
-                       viewfeed(feed, '', is_cat);
+                       viewfeed({feed: feed, is_cat: is_cat});
                        return false;
                },
                openOnClick: false,
@@ -101,7 +103,7 @@ function updateFeedList() {
                $("feeds-holder").appendChild(tree.domNode);
 
                var tmph = dojo.connect(tree, 'onLoad', function() {
-               dojo.disconnect(tmph);
+                       dojo.disconnect(tmph);
                        Element.hide("feedlistLoading");
 
                        feedlist_init();
@@ -114,6 +116,7 @@ function updateFeedList() {
 
                tree.startup();
 
+
        } catch (e) {
                exception_error("updateFeedList", e);
        }
@@ -134,7 +137,8 @@ function catchupAllFeeds() {
                new Ajax.Request("backend.php", {
                        parameters: query_str,
                        onComplete: function(transport) {
-                               feedlist_callback2(transport);
+                               request_counters(true);
+                               viewCurrentFeed();
                        } });
 
                global_unread = 0;
@@ -143,10 +147,10 @@ function catchupAllFeeds() {
 }
 
 function viewCurrentFeed(method) {
-       console.log("viewCurrentFeed");
+       console.log("viewCurrentFeed: " + method);
 
        if (getActiveFeedId() != undefined) {
-               viewfeed(getActiveFeedId(), method, activeFeedIsCat());
+               viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), method: method});
        }
        return false; // block unneeded form submits
 }
@@ -159,7 +163,7 @@ function timeout() {
 }
 
 function search() {
-       var query = "backend.php?op=dlg&method=search&param=" +
+       var query = "backend.php?op=feeds&method=search&param=" +
                param_escape(getActiveFeedId() + ":" + activeFeedIsCat());
 
        if (dijit.byId("searchDlg"))
@@ -214,295 +218,396 @@ function init() {
        try {
                //dojo.registerModulePath("fox", "../../js/");
 
-               dojo.require("fox.FeedTree");
-
-               dojo.require("dijit.ColorPalette");
-               dojo.require("dijit.Dialog");
-               dojo.require("dijit.form.Button");
-               dojo.require("dijit.form.CheckBox");
-               dojo.require("dijit.form.DropDownButton");
-               dojo.require("dijit.form.FilteringSelect");
-               dojo.require("dijit.form.Form");
-               dojo.require("dijit.form.RadioButton");
-               dojo.require("dijit.form.Select");
-               dojo.require("dijit.form.SimpleTextarea");
-               dojo.require("dijit.form.TextBox");
-               dojo.require("dijit.form.ValidationTextBox");
-               dojo.require("dijit.InlineEditBox");
-               dojo.require("dijit.layout.AccordionContainer");
-               dojo.require("dijit.layout.BorderContainer");
-               dojo.require("dijit.layout.ContentPane");
-               dojo.require("dijit.layout.TabContainer");
-               dojo.require("dijit.Menu");
-               dojo.require("dijit.ProgressBar");
-               dojo.require("dijit.ProgressBar");
-               dojo.require("dijit.Toolbar");
-               dojo.require("dijit.Tree");
-               dojo.require("dijit.tree.dndSource");
-               dojo.require("dojo.data.ItemFileWriteStore");
-
-               dojo.parser.parse();
-
-               if (!genericSanityCheck())
-                       return false;
+               require(["dojo/_base/kernel",
+                               "dojo/ready",
+                               "dojo/parser",
+                               "dojo/_base/loader",
+                               "dijit/ProgressBar",
+                               "dijit/ColorPalette",
+                               "dijit/Dialog",
+                               "dijit/form/Button",
+                               "dijit/form/ComboButton",
+                               "dijit/form/CheckBox",
+                               "dijit/form/DropDownButton",
+                               "dijit/form/FilteringSelect",
+                               "dijit/form/Form",
+                               "dijit/form/RadioButton",
+                               "dijit/form/Select",
+                               "dijit/form/SimpleTextarea",
+                               "dijit/form/TextBox",
+                               "dijit/form/ComboBox",
+                               "dijit/form/ValidationTextBox",
+                               "dijit/InlineEditBox",
+                               "dijit/layout/AccordionContainer",
+                               "dijit/layout/BorderContainer",
+                               "dijit/layout/ContentPane",
+                               "dijit/layout/TabContainer",
+                               "dijit/PopupMenuItem",
+                               "dijit/Menu",
+                               "dijit/Toolbar",
+                               "dijit/Tree",
+                               "dijit/tree/dndSource",
+                               "dijit/tree/ForestStoreModel",
+                               "dojo/data/ItemFileWriteStore" ], function (dojo, ready, parser) {
+
+                               ready(function() {
+
+                                       dojo.require("fox.FeedTree");
+
+                                       parser.parse();
+
+                                       if (!genericSanityCheck())
+                                               return false;
 
-               loading_set_progress(20);
+                                       loading_set_progress(30);
 
-               var hasAudio = !!((myAudioTag = document.createElement('audio')).canPlayType);
-               var hasSandbox = "sandbox" in document.createElement("iframe");
+                                       var a = document.createElement('audio');
 
-               new Ajax.Request("backend.php", {
-                       parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
-                               hasSandbox: hasSandbox},
-                       onComplete: function(transport) {
-                                       backend_sanity_check_callback(transport);
-                               } });
+                                       var hasAudio = !!a.canPlayType;
+                                       var hasSandbox = "sandbox" in document.createElement("iframe");
+                                       var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
+                                       var clientTzOffset = new Date().getTimezoneOffset() * 60;
 
-               hotkey_actions["next_feed"] = function() {
-                               var rv = dijit.byId("feedTree").getNextFeed(
-                                               getActiveFeedId(), activeFeedIsCat());
+                                       init_hotkey_actions();
 
-                               if (rv) viewfeed(rv[0], '', rv[1]);
-               };
-               hotkey_actions["prev_feed"] = function() {
-                               var rv = dijit.byId("feedTree").getPreviousFeed(
-                                               getActiveFeedId(), activeFeedIsCat());
+                                       new Ajax.Request("backend.php", {
+                                               parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+                                                       hasMp3: hasMp3,
+                                                       clientTzOffset: clientTzOffset,
+                                                       hasSandbox: hasSandbox},
+                                               onComplete: function(transport) {
+                                                       backend_sanity_check_callback(transport);
+                                               } });
 
-                               if (rv) viewfeed(rv[0], '', rv[1]);
-               };
-               hotkey_actions["next_article"] = function() {
-                               moveToPost('next');
-               };
-               hotkey_actions["prev_article"] = function() {
-                               moveToPost('prev');
-               };
-               hotkey_actions["next_article_noscroll"] = function() {
-                               moveToPost('next', true);
-               };
-               hotkey_actions["prev_article_noscroll"] = function() {
-                               moveToPost('prev', true);
-               };
-               hotkey_actions["collapse_article"] = function() {
-                               var id = getActiveArticleId();
-                               var elem = $("CICD-"+id);
-                               if(elem.visible()) {
-                                       cdmCollapseArticle(null, id);
-                               }
-                               else {
-                                       cdmExpandArticle(id);
-                               }
-               };
-               hotkey_actions["search_dialog"] = function() {
-                               search();
-               };
-               hotkey_actions["toggle_mark"] = function() {
-                               selectionToggleMarked(undefined, false, true);
-               };
-               hotkey_actions["toggle_publ"] = function() {
-                               selectionTogglePublished(undefined, false, true);
-               };
-               hotkey_actions["toggle_unread"] = function() {
-                               selectionToggleUnread(undefined, false, true);
-               };
-               hotkey_actions["edit_tags"] = function() {
-                               var id = getActiveArticleId();
-                               if (id) {
-                                       editArticleTags(id, getActiveFeedId(), isCdmMode());
-                               };
+
+                               });
+
+
+               });
+
+       } catch (e) {
+               exception_error("init", e);
+       }
+}
+
+function init_hotkey_actions() {
+       hotkey_actions["next_feed"] = function() {
+               var rv = dijit.byId("feedTree").getNextFeed(
+                       getActiveFeedId(), activeFeedIsCat());
+
+               if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
+       };
+       hotkey_actions["prev_feed"] = function() {
+               var rv = dijit.byId("feedTree").getPreviousFeed(
+                       getActiveFeedId(), activeFeedIsCat());
+
+               if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
+       };
+       hotkey_actions["next_article"] = function() {
+               moveToPost('next');
+       };
+       hotkey_actions["prev_article"] = function() {
+               moveToPost('prev');
+       };
+       hotkey_actions["next_article_noscroll"] = function() {
+               moveToPost('next', true);
+       };
+       hotkey_actions["prev_article_noscroll"] = function() {
+               moveToPost('prev', true);
+       };
+       hotkey_actions["next_article_noexpand"] = function() {
+               moveToPost('next', true, true);
+       };
+       hotkey_actions["prev_article_noexpand"] = function() {
+               moveToPost('prev', true, true);
+       };
+       hotkey_actions["collapse_article"] = function() {
+               var id = getActiveArticleId();
+               var elem = $("CICD-"+id);
+
+               if (elem) {
+                       if (elem.visible()) {
+                               cdmCollapseArticle(null, id);
                        }
-               hotkey_actions["dismiss_selected"] = function() {
-                               dismissSelectedArticles();
-               };
-               hotkey_actions["open_in_new_window"] = function() {
-                               if (getActiveArticleId()) {
-                                       openArticleInNewWindow(getActiveArticleId());
-                                       return;
-                               }
-               };
-               hotkey_actions["catchup_below"] = function() {
-                               catchupRelativeToArticle(1);
-               };
-               hotkey_actions["catchup_above"] = function() {
-                               catchupRelativeToArticle(0);
+                       else {
+                               cdmExpandArticle(id);
+                       }
+               }
+       };
+       hotkey_actions["toggle_expand"] = function() {
+               var id = getActiveArticleId();
+               var elem = $("CICD-"+id);
+
+               if (elem) {
+                       if (elem.visible()) {
+                               cdmCollapseArticle(null, id, false);
+                       }
+                       else {
+                               cdmExpandArticle(id);
+                       }
+               }
+       };
+       hotkey_actions["search_dialog"] = function() {
+               search();
+       };
+       hotkey_actions["toggle_mark"] = function() {
+               selectionToggleMarked(undefined, false, true);
+       };
+       hotkey_actions["toggle_publ"] = function() {
+               selectionTogglePublished(undefined, false, true);
+       };
+       hotkey_actions["toggle_unread"] = function() {
+               selectionToggleUnread(undefined, false, true);
+       };
+       hotkey_actions["edit_tags"] = function() {
+               var id = getActiveArticleId();
+               if (id) {
+                       editArticleTags(id);
                };
-               hotkey_actions["article_scroll_down"] = function() {
-                               var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+       }
+       hotkey_actions["open_in_new_window"] = function() {
+               if (getActiveArticleId()) {
+                       openArticleInNewWindow(getActiveArticleId());
+                       return;
+               }
+       };
+       hotkey_actions["catchup_below"] = function() {
+               catchupRelativeToArticle(1);
+       };
+       hotkey_actions["catchup_above"] = function() {
+               catchupRelativeToArticle(0);
+       };
+       hotkey_actions["article_scroll_down"] = function() {
+               var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+               scrollArticle(40);
+       };
+       hotkey_actions["article_scroll_up"] = function() {
+               var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+
+               scrollArticle(-40);
+       };
+       hotkey_actions["close_article"] = function() {
+               if (isCdmMode()) {
+                       if (!getInitParam("cdm_expanded")) {
+                               cdmCollapseArticle(false, getActiveArticleId());
+                       }
+               } else {
+                       closeArticlePanel();
+               }
+       };
+       hotkey_actions["email_article"] = function() {
+               if (typeof emailArticle != "undefined") {
+                       emailArticle();
+               } else if (typeof mailtoArticle != "undefined") {
+                       mailtoArticle();
+               } else {
+                       alert(__("Please enable mail plugin first."));
+               }
+       };
+       hotkey_actions["select_all"] = function() {
+               selectArticles('all');
+       };
+       hotkey_actions["select_unread"] = function() {
+               selectArticles('unread');
+       };
+       hotkey_actions["select_marked"] = function() {
+               selectArticles('marked');
+       };
+       hotkey_actions["select_published"] = function() {
+               selectArticles('published');
+       };
+       hotkey_actions["select_invert"] = function() {
+               selectArticles('invert');
+       };
+       hotkey_actions["select_none"] = function() {
+               selectArticles('none');
+       };
+       hotkey_actions["feed_refresh"] = function() {
+               if (getActiveFeedId() != undefined) {
+                       viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
+                       return;
+               }
+       };
+       hotkey_actions["feed_unhide_read"] = function() {
+               toggleDispRead();
+       };
+       hotkey_actions["feed_subscribe"] = function() {
+               quickAddFeed();
+       };
+       hotkey_actions["feed_debug_update"] = function() {
+               if (!activeFeedIsCat() && parseInt(getActiveFeedId()) > 0) {
+                       window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + getActiveFeedId() +
+                               "&csrf_token=" + getInitParam("csrf_token"));
+               } else {
+                       alert("You can't debug this kind of feed.");
+               }
+       };
+
+       hotkey_actions["feed_debug_viewfeed"] = function() {
+               viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
+       };
+
+       hotkey_actions["feed_edit"] = function() {
+               if (activeFeedIsCat())
+                       alert(__("You can't edit this kind of feed."));
+               else
+                       editFeed(getActiveFeedId());
+       };
+       hotkey_actions["feed_catchup"] = function() {
+               if (getActiveFeedId() != undefined) {
+                       catchupCurrentFeed();
+                       return;
+               }
+       };
+       hotkey_actions["feed_reverse"] = function() {
+               reverseHeadlineOrder();
+       };
+       hotkey_actions["feed_toggle_vgroup"] = function() {
+               var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
 
-                               scrollArticle(40);
-               };
-               hotkey_actions["article_scroll_up"] = function() {
-                               var ctr = $("content_insert") ? $("content_insert") : $("headlines-frame");
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
+                       onComplete: function(transport) {
+                               viewCurrentFeed();
+                       } });
 
-                               scrollArticle(-40);
-               };
-               hotkey_actions["close_article"] = function() {
-                               if (isCdmMode()) {
-                                       if (!getInitParam("cdm_expanded")) {
-                                               cdmCollapseArticle(false, getActiveArticleId());
-                                       } else {
-                                               dismissArticle(getActiveArticleId());
-                                       }
-                               } else {
-                                       closeArticlePanel();
-                               }
-               };
-               hotkey_actions["email_article"] = function() {
-                               if (typeof emailArticle != "undefined") {
-                                       emailArticle();
-                               } else if (typeof mailtoArticle != "undefined") {
-                                       mailtoArticle();
-                               } else {
-                                       alert(__("Please enable mail plugin first."));
-                               }
-               };
-               hotkey_actions["select_all"] = function() {
-                               selectArticles('all');
-               };
-               hotkey_actions["select_unread"] = function() {
-                               selectArticles('unread');
-               };
-               hotkey_actions["select_marked"] = function() {
-                               selectArticles('marked');
-               };
-               hotkey_actions["select_published"] = function() {
-                               selectArticles('published');
-               };
-               hotkey_actions["select_invert"] = function() {
-                               selectArticles('invert');
-               };
-               hotkey_actions["select_none"] = function() {
-                               selectArticles('none');
-               };
-               hotkey_actions["feed_refresh"] = function() {
-                               if (getActiveFeedId() != undefined) {
-                                       viewfeed(getActiveFeedId(), '', activeFeedIsCat());
-                                       return;
-                               }
-               };
-               hotkey_actions["feed_unhide_read"] = function() {
-                               toggleDispRead();
-               };
-               hotkey_actions["feed_subscribe"] = function() {
-                               quickAddFeed();
-               };
-               hotkey_actions["feed_debug_update"] = function() {
-                               window.open("backend.php?op=feeds&method=view&feed=" + getActiveFeedId() +
-                                       "&view_mode=adaptive&order_by=default&update=&m=ForceUpdate&cat=" +
-                                       activeFeedIsCat() + "&DevForceUpdate=1&debug=1&xdebug=1&csrf_token=" +
-                                       getInitParam("csrf_token"));
-               };
-               hotkey_actions["feed_edit"] = function() {
-                               if (activeFeedIsCat())
-                                       alert(__("You can't edit this kind of feed."));
-                               else
-                                       editFeed(getActiveFeedId());
-               };
-               hotkey_actions["feed_catchup"] = function() {
-                               if (getActiveFeedId() != undefined) {
-                                       catchupCurrentFeed();
-                                       return;
-                               }
-               };
-               hotkey_actions["feed_reverse"] = function() {
-                               reverseHeadlineOrder();
-               };
-               hotkey_actions["catchup_all"] = function() {
-                               catchupAllFeeds();
-               };
-               hotkey_actions["cat_toggle_collapse"] = function() {
-                               if (activeFeedIsCat()) {
-                                       dijit.byId("feedTree").collapseCat(getActiveFeedId());
-                                       return;
-                               }
-               };
-               hotkey_actions["goto_all"] = function() {
-                               viewfeed(-4);
-               };
-               hotkey_actions["goto_fresh"] = function() {
-                               viewfeed(-3);
-               };
-               hotkey_actions["goto_marked"] = function() {
-                               viewfeed(-1);
-               };
-               hotkey_actions["goto_published"] = function() {
-                               viewfeed(-2);
-               };
-               hotkey_actions["goto_tagcloud"] = function() {
-                               displayDlg("printTagCloud");
-               };
-               hotkey_actions["goto_prefs"] = function() {
-                               gotoPreferences();
-               };
-               hotkey_actions["select_article_cursor"] = function() {
-                               var id = getArticleUnderPointer();
-                               if (id) {
-                                       var cb = dijit.byId("RCHK-" + id);
-                                       if (cb) {
-                                               cb.attr("checked", !cb.attr("checked"));
-                                               toggleSelectRowById(cb, "RROW-" + id);
-                                               return false;
-                                       }
-                               }
-               };
-               hotkey_actions["create_label"] = function() {
-                               addLabel();
-               };
-               hotkey_actions["create_filter"] = function() {
-                               quickAddFilter();
-               };
-               hotkey_actions["collapse_sidebar"] = function() {
-                               collapse_feedlist();
-               };
-               hotkey_actions["toggle_embed_original"] = function() {
-                               if (typeof embedOriginalArticle != "undefined") {
-                                       if (getActiveArticleId())
-                                               embedOriginalArticle(getActiveArticleId());
-                               } else {
-                                       alert(__("Please enable embed_original plugin first."));
+       };
+       hotkey_actions["catchup_all"] = function() {
+               catchupAllFeeds();
+       };
+       hotkey_actions["cat_toggle_collapse"] = function() {
+               if (activeFeedIsCat()) {
+                       dijit.byId("feedTree").collapseCat(getActiveFeedId());
+                       return;
+               }
+       };
+       hotkey_actions["goto_all"] = function() {
+               viewfeed({feed: -4});
+       };
+       hotkey_actions["goto_fresh"] = function() {
+               viewfeed({feed: -3});
+       };
+       hotkey_actions["goto_marked"] = function() {
+               viewfeed({feed: -1});
+       };
+       hotkey_actions["goto_published"] = function() {
+               viewfeed({feed: -2});
+       };
+       hotkey_actions["goto_tagcloud"] = function() {
+               displayDlg(__("Tag cloud"), "printTagCloud");
+       };
+       hotkey_actions["goto_prefs"] = function() {
+               gotoPreferences();
+       };
+       hotkey_actions["select_article_cursor"] = function() {
+               var id = getArticleUnderPointer();
+               if (id) {
+                       var row = $("RROW-" + id);
+
+                       if (row) {
+                               var cb = dijit.getEnclosingWidget(
+                                       row.getElementsByClassName("rchk")[0]);
+
+                               if (cb) {
+                                       cb.attr("checked", !cb.attr("checked"));
+                                       toggleSelectRowById(cb, "RROW-" + id);
+                                       return false;
                                }
-               };
-               hotkey_actions["toggle_widescreen"] = function() {
-                               if (!isCdmMode()) {
-                                       _widescreen_mode = !_widescreen_mode;
+                       }
+               }
+       };
+       hotkey_actions["create_label"] = function() {
+               addLabel();
+       };
+       hotkey_actions["create_filter"] = function() {
+               quickAddFilter();
+       };
+       hotkey_actions["collapse_sidebar"] = function() {
+               collapse_feedlist();
+       };
+       hotkey_actions["toggle_embed_original"] = function() {
+               if (typeof embedOriginalArticle != "undefined") {
+                       if (getActiveArticleId())
+                               embedOriginalArticle(getActiveArticleId());
+               } else {
+                       alert(__("Please enable embed_original plugin first."));
+               }
+       };
+       hotkey_actions["toggle_widescreen"] = function() {
+               if (!isCdmMode()) {
+                       _widescreen_mode = !_widescreen_mode;
 
-                                       switchPanelMode(_widescreen_mode);
-                               }
-               };
-               hotkey_actions["help_dialog"] = function() {
-                               helpDialog("main");
-               };
-               hotkey_actions["toggle_combined_mode"] = function() {
-                               notify_progress("Loading, please wait...");
+                       // reset stored sizes because geometry changed
+                       setCookie("ttrss_ci_width", 0);
+                       setCookie("ttrss_ci_height", 0);
 
-                               var value = isCdmMode() ? "false" : "true";
-                               var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
+                       switchPanelMode(_widescreen_mode);
+               } else {
+                       alert(__("Widescreen is not available in combined mode."));
+               }
+       };
+       hotkey_actions["help_dialog"] = function() {
+               helpDialog("main");
+       };
+       hotkey_actions["toggle_combined_mode"] = function() {
+               notify_progress("Loading, please wait...");
 
-                               new Ajax.Request("backend.php", {
-                                       parameters: query,
-                                       onComplete: function(transport) {
-                                               window.location.reload();
-                                       } });
-               };
+               var value = isCdmMode() ? "false" : "true";
+               var query = "?op=rpc&method=setpref&key=COMBINED_DISPLAY_MODE&value=" + value;
 
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               setInitParam("combined_display_mode",
+                                       !getInitParam("combined_display_mode"));
 
-       } catch (e) {
-               exception_error("init", e);
-       }
+                               closeArticlePanel();
+                               viewCurrentFeed();
+
+                       } });
+       };
+       hotkey_actions["toggle_cdm_expanded"] = function() {
+               notify_progress("Loading, please wait...");
+
+               var value = getInitParam("cdm_expanded") ? "false" : "true";
+               var query = "?op=rpc&method=setpref&key=CDM_EXPANDED&value=" + value;
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                               setInitParam("cdm_expanded", !getInitParam("cdm_expanded"));
+                               viewCurrentFeed();
+                       } });
+       };
 }
 
 function init_second_stage() {
 
        try {
-               dojo.addOnLoad(function() {
-                       updateFeedList();
-                       closeArticlePanel();
+               updateFeedList();
+               closeArticlePanel();
 
-                       _widescreen_mode = getInitParam("widescreen");
+               if (parseInt(getCookie("ttrss_fh_width")) > 0) {
+                       dijit.byId("feeds-holder").domNode.setStyle(
+                               {width: getCookie("ttrss_fh_width") + "px" });
+               }
 
-                       if (_widescreen_mode) {
-                               switchPanelMode(_widescreen_mode);
-                       }
+               dijit.byId("main").resize();
+
+               var tmph = dojo.connect(dijit.byId('feeds-holder'), 'resize',
+                       function (args) {
+                               if (args && args.w >= 0) {
+                                       setCookie("ttrss_fh_width", args.w, getInitParam("cookie_lifetime"));
+                               }
+               });
 
+               var tmph = dojo.connect(dijit.byId('content-insert'), 'resize',
+                       function (args) {
+                               if (args && args.w >= 0 && args.h >= 0) {
+                                       setCookie("ttrss_ci_width", args.w, getInitParam("cookie_lifetime"));
+                                       setCookie("ttrss_ci_height", args.h, getInitParam("cookie_lifetime"));
+                               }
                });
 
                delCookie("ttrss_test");
@@ -524,7 +629,7 @@ function init_second_stage() {
                        setActiveFeedId(hash_feed_id, hash_feed_is_cat);
                }
 
-               loading_set_progress(30);
+               loading_set_progress(50);
 
                // can't use cache_clear() here because viewfeed might not have initialized yet
                if ('sessionStorage' in window && window['sessionStorage'] !== null)
@@ -541,6 +646,9 @@ function init_second_stage() {
                hotkeys[1] = tmp;
                setInitParam("hotkeys", hotkeys);
 
+               _widescreen_mode = getInitParam("widescreen");
+               switchPanelMode(_widescreen_mode);
+
                console.log("second stage ok");
 
                if (getInitParam("simple_update")) {
@@ -563,10 +671,7 @@ function quickMenuGo(opid) {
                        gotoLogout();
                        break;
                case "qmcTagCloud":
-                       displayDlg("printTagCloud");
-                       break;
-               case "qmcTagSelect":
-                       displayDlg("printTagSelect");
+                       displayDlg(__("Tag cloud"), "printTagCloud");
                        break;
                case "qmcSearch":
                        search();
@@ -623,7 +728,13 @@ function quickMenuGo(opid) {
                        if (!isCdmMode()) {
                                _widescreen_mode = !_widescreen_mode;
 
+                               // reset stored sizes because geometry changed
+                               setCookie("ttrss_ci_width", 0);
+                               setCookie("ttrss_ci_height", 0);
+
                                switchPanelMode(_widescreen_mode);
+                       } else {
+                               alert(__("Widescreen is not available in combined mode."));
                        }
                        break;
                case "qmcHKhelp":
@@ -669,15 +780,6 @@ function parse_runtime_info(data) {
 
 //             console.log("RI: " + k + " => " + v);
 
-               if (k == "new_version_available") {
-                       if (v == "1") {
-                               Element.show(dijit.byId("newVersionIcon").domNode);
-                       } else {
-                               Element.hide(dijit.byId("newVersionIcon").domNode);
-                       }
-                       return;
-               }
-
                if (k == "dep_ts" && parseInt(getInitParam("dep_ts")) > 0) {
                        if (parseInt(getInitParam("dep_ts")) < parseInt(v) && getInitParam("reload_on_ts_change")) {
                                window.location.reload();
@@ -685,12 +787,22 @@ function parse_runtime_info(data) {
                }
 
                if (k == "daemon_is_running" && v != 1) {
-                       notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true);
+                       notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
                        return;
                }
 
+               if (k == "update_result") {
+                       var updatesIcon = dijit.byId("updatesIcon").domNode;
+
+                       if (v) {
+                               Element.show(updatesIcon);
+                       } else {
+                               Element.hide(updatesIcon);
+                       }
+               }
+
                if (k == "daemon_stamp_ok" && v != 1) {
-                       notify_error("<span onclick=\"javascript:explainError(3)\">Update daemon is not updating feeds.</span>", true);
+                       notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
                        return;
                }
 
@@ -704,6 +816,8 @@ function parse_runtime_info(data) {
                init_params[k] = v;
                notify('');
        }
+
+       PluginHost.run(PluginHost.HOOK_RUNTIME_INFO_LOADED, data);
 }
 
 function collapse_feedlist() {
@@ -711,19 +825,14 @@ function collapse_feedlist() {
 
                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;";
                }
 
                dijit.byId("main").resize();
 
-               query = "?op=rpc&method=setpref&key=_COLLAPSED_FEEDLIST&value=true";
-               new Ajax.Request("backend.php", { parameters: query });
-
        } catch (e) {
                exception_error("collapse_feedlist", e);
        }
@@ -734,10 +843,6 @@ function viewModeChanged() {
        return viewCurrentFeed('');
 }
 
-function viewLimitChanged() {
-       return viewCurrentFeed('');
-}
-
 function rescoreCurrentFeed() {
 
        var actid = getActiveFeedId();
@@ -775,11 +880,16 @@ function hotkey_handler(e) {
 
                var keycode = false;
                var shift_key = false;
+               var ctrl_key = false;
+               var alt_key = false;
+               var meta_key = false;
 
                var cmdline = $('cmdline');
 
                shift_key = e.shiftKey;
                ctrl_key = e.ctrlKey;
+               alt_key = e.altKey;
+               meta_key = e.metaKey;
 
                if (window.event) {
                        keycode = window.event.keyCode;
@@ -821,6 +931,8 @@ function hotkey_handler(e) {
                // ensure ^*char notation
                if (shift_key) hotkey = "*" + hotkey;
                if (ctrl_key) hotkey = "^" + hotkey;
+               if (alt_key) hotkey = "+" + hotkey;
+               if (meta_key) hotkey = "%" + hotkey;
 
                hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
                hotkey_prefix = false;
@@ -854,37 +966,30 @@ function inPreferences() {
 function reverseHeadlineOrder() {
        try {
 
-               var query_str = "?op=rpc&method=togglepref&key=REVERSE_HEADLINES";
+               /* var query_str = "?op=rpc&method=togglepref&key=REVERSE_HEADLINES";
 
                new Ajax.Request("backend.php", {
                        parameters: query_str,
                        onComplete: function(transport) {
                                        viewCurrentFeed();
-                               } });
+                               } }); */
 
-       } catch (e) {
-               exception_error("reverseHeadlineOrder", e);
-       }
-}
+               var toolbar = document.forms["main_toolbar_form"];
+               var order_by = dijit.getEnclosingWidget(toolbar.order_by);
 
-function newVersionDlg() {
-       try {
-               var query = "backend.php?op=dlg&method=newVersion";
+               var value = order_by.attr('value');
 
-               if (dijit.byId("newVersionDlg"))
-                       dijit.byId("newVersionDlg").destroyRecursive();
+               if (value == "date_reverse")
+                       value = "default";
+               else
+                       value = "date_reverse";
 
-               dialog = new dijit.Dialog({
-                       id: "newVersionDlg",
-                       title: __("New version available!"),
-                       style: "width: 600px",
-                       href: query,
-               });
+               order_by.attr('value', value);
 
-               dialog.show();
+               viewCurrentFeed();
 
        } catch (e) {
-               exception_error("newVersionDlg", e);
+               exception_error("reverseHeadlineOrder", e);
        }
 }
 
@@ -892,6 +997,12 @@ function handle_rpc_json(transport, scheduled_call) {
        try {
                var reply = JSON.parse(transport.responseText);
 
+               var netalert_dijit = dijit.byId("net-alert");
+               var netalert = false;
+
+               if (netalert_dijit)
+                       netalert = netalert_dijit.domNode;
+
                if (reply) {
 
                        var error = reply['error'];
@@ -933,21 +1044,26 @@ function handle_rpc_json(transport, scheduled_call) {
                        if (counters)
                                parse_counters(counters, scheduled_call);
 
-                       var runtime_info = reply['runtime-info'];;
+                       var runtime_info = reply['runtime-info'];
 
                        if (runtime_info)
                                parse_runtime_info(runtime_info);
 
-                       Element.hide(dijit.byId("net-alert").domNode);
+                       if (netalert) Element.hide(netalert);
 
                } else {
-                       //notify_error("Error communicating with server.");
-                       Element.show(dijit.byId("net-alert").domNode);
+                       if (netalert)
+                               Element.show(netalert);
+                       else
+                               notify_error("Communication problem with server.");
                }
 
        } catch (e) {
-               Element.show(dijit.byId("net-alert").domNode);
-               //notify_error("Error communicating with server.");
+               if (netalert)
+                       Element.show(netalert);
+               else
+                       notify_error("Communication problem with server.");
+
                console.log(e);
                //exception_error("handle_rpc_json", e, transport);
        }
@@ -967,11 +1083,15 @@ function switchPanelMode(wide) {
 
                        dijit.byId("content-insert").domNode.setStyle({width: '50%',
                                height: 'auto',
-                               borderLeftWidth: '1px',
-                               borderLeftColor: '#c0c0c0',
                                borderTopWidth: '0px' });
 
-                       $("headlines-toolbar").setStyle({ borderBottomWidth: '0px' });
+                       if (parseInt(getCookie("ttrss_ci_width")) > 0) {
+                               dijit.byId("content-insert").domNode.setStyle(
+                                       {width: getCookie("ttrss_ci_width") + "px" });
+                       }
+
+                       $("headlines-frame").setStyle({ borderBottomWidth: '0px' });
+                       $("headlines-frame").addClassName("wide");
 
                } else {
 
@@ -979,10 +1099,16 @@ function switchPanelMode(wide) {
 
                        dijit.byId("content-insert").domNode.setStyle({width: 'auto',
                                height: '50%',
-                               borderLeftWidth: '0px',
-                               borderTopWidth: '1px'});
+                               borderTopWidth: '0px'});
+
+                       if (parseInt(getCookie("ttrss_ci_height")) > 0) {
+                               dijit.byId("content-insert").domNode.setStyle(
+                                       {height: getCookie("ttrss_ci_height") + "px" });
+                       }
+
+                       $("headlines-frame").setStyle({ borderBottomWidth: '1px' });
+                       $("headlines-frame").removeClassName("wide");
 
-                       $("headlines-toolbar").setStyle({ borderBottomWidth: '1px' });
                }
 
                closeArticlePanel();
@@ -1022,7 +1148,7 @@ function hash_get(key) {
                kv = window.location.hash.substring(1).toQueryParams();
                return kv[key];
        } catch (e) {
-               exception_error("hash_set", e);
+               exception_error("hash_get", e);
        }
 }
 function hash_set(key, value) {