]> git.wh0rd.org - tt-rss.git/blobdiff - js/tt-rss.js
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
[tt-rss.git] / js / tt-rss.js
index 38232bdfee592142dc7c61f4bb6311adb0e41abf..67fbea28e4d6d8df677adc743b2253919ee5528b 100644 (file)
@@ -1,11 +1,10 @@
 var total_unread = 0;
 var global_unread = -1;
 var firsttime_update = true;
-var _active_feed_id = 0;
+var _active_feed_id = undefined;
 var _active_feed_is_cat = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
-var init_params = {};
 var _force_scheduled_update = false;
 var last_scheduled_update = false;
 
@@ -42,7 +41,6 @@ function setActiveFeedId(id, is_cat) {
                }
 
                selectFeed(id, is_cat);
-
        } catch (e) {
                exception_error("setActiveFeedId", e);
        }
@@ -62,12 +60,12 @@ function updateFeedList() {
                }
 
                var store = new dojo.data.ItemFileWriteStore({
-         url: "backend.php?op=feeds"});
+         url: "backend.php?op=pref_feeds&method=getfeedtree&mode=2"});
 
                var treeModel = new fox.FeedStoreModel({
                        store: store,
                        query: {
-                               "type": "feed"
+                               "type": getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
                        },
                        rootId: "root",
                        rootLabel: "Feeds",
@@ -106,6 +104,8 @@ function updateFeedList() {
                id: "feedTree",
                }, "feedTree");
 
+               _force_scheduled_update = true;
+
 /*             var menu = new dijit.Menu({id: 'feedMenu'});
 
                menu.addChild(new dijit.MenuItem({
@@ -166,6 +166,7 @@ function catchupAllFeeds() {
 }
 
 function viewCurrentFeed(method) {
+       console.log("viewCurrentFeed");
 
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), method, activeFeedIsCat());
@@ -274,7 +275,7 @@ function genericSanityCheck() {
 
 function init() {
        try {
-               dojo.registerModulePath("fox", "../../js/");
+               //dojo.registerModulePath("fox", "../../js/");
 
                dojo.require("fox.FeedTree");
 
@@ -282,17 +283,32 @@ function init() {
                        themeBeforeLayout();
                }
 
-               dojo.parser.parse();
-
-               dojo.addOnLoad(function() {
-                       updateFeedList();
-                       closeArticlePanel();
-
-                       if (typeof themeAfterLayout == 'function') {
-                               themeAfterLayout();
-                       }
+               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;
@@ -315,6 +331,15 @@ function init() {
 function init_second_stage() {
 
        try {
+               dojo.addOnLoad(function() {
+                       updateFeedList();
+                       closeArticlePanel();
+
+                       if (typeof themeAfterLayout == 'function') {
+                               themeAfterLayout();
+                       }
+
+               });
 
                delCookie("ttrss_test");
 
@@ -366,7 +391,7 @@ function quickMenuGo(opid) {
                }
 
                if (opid == "qmcDigest") {
-                       window.location.href = "digest.php";
+                       window.location.href = "backend.php?op=digest";
                        return;
                }
 
@@ -428,18 +453,12 @@ function quickMenuGo(opid) {
                }
 
                if (opid == "qmcHKhelp") {
-                       //Element.show("hotkey_help_overlay");
-                       Effect.Appear("hotkey_help_overlay", {duration : 0.3});
-               }
-
-               if (opid == "qmcAbout") {
-                       dialog = new dijit.Dialog({
-                               title: __("About..."),
-                               style: "width: 400px",
-                               href: "backend.php?op=dlg&method=about",
-                       });
-
-                       dialog.show();
+                       new Ajax.Request("backend.php", {
+                               parameters: "?op=backend&method=help&topic=main",
+                               onComplete: function(transport) {
+                                       $("hotkey_help_overlay").innerHTML = transport.responseText;
+                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3});
+                               } });
                }
 
        } catch (e) {
@@ -512,34 +531,6 @@ function parse_runtime_info(data) {
        }
 }
 
-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)) {
-               return viewCurrentFeed('MarkAllRead');
-       }
-}
-
-function catchupFeedInGroup(id) {
-
-       try {
-
-               var title = getFeedName(id);
-
-               var str = __("Mark all articles in %s as read?").replace("%s", title);
-
-               if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
-                       return viewCurrentFeed('MarkAllReadGR:' + id);
-               }
-
-       } catch (e) {
-               exception_error("catchupFeedInGroup", e);
-       }
-}
-
 function collapse_feedlist() {
        try {
 
@@ -564,6 +555,7 @@ function collapse_feedlist() {
 }
 
 function viewModeChanged() {
+       cache_clear();
        return viewCurrentFeed('');
 }
 
@@ -655,13 +647,134 @@ function hotkey_handler(e) {
                if (keycode == 16) return; // ignore lone shift
                if (keycode == 17) return; // ignore lone ctrl
 
-               if ((keycode == 70 || keycode == 67 || keycode == 71 || keycode == 65)
+               if (!shift_key) keychar = keychar.toLowerCase();
+
+               if (!hotkey_prefix && ["a", "f", "g", "c"].indexOf(keychar) != -1) {
+
+                       var date = new Date();
+                       var ts = Math.round(date.getTime() / 1000);
+
+                       hotkey_prefix = keychar;
+                       hotkey_prefix_pressed = ts;
+
+                       cmdline.innerHTML = keychar;
+                       Element.show(cmdline);
+
+                       return true;
+               }
+
+               Element.hide(cmdline);
+
+               var hotkey = keychar.search(/[a-zA-Z0-9]/) != -1 ? keychar : "(" + keycode + ")";
+               hotkey = hotkey_prefix ? hotkey_prefix + " " + hotkey : hotkey;
+               hotkey_prefix = false;
+
+               var hotkey_action = false;
+               var hotkeys = getInitParam("hotkeys");
+
+               for (cat in hotkeys) {
+                       for (action in hotkeys[cat]) {
+                               if (hotkeys[cat][action] == hotkey) {
+                                       hotkey_action = action;
+                                       break;
+                               }
+                       }
+               }
+
+               switch (hotkey_action) {
+               case "next_feed":
+                       return true;
+               case "prev_feed":
+                       return true;
+               case "next_article":
+                       return true;
+               case "prev_article":
+                       return true;
+               case "search_dialog":
+                       return true;
+               case "toggle_mark":
+                       return true;
+               case "toggle_publ":
+                       return true;
+               case "toggle_unread":
+                       return true;
+               case "edit_tags":
+                       return true;
+               case "dismiss_selected":
+                       return true;
+               case "dismiss_read":
+                       return true;
+               case "open_in_new_window":
+                       return true;
+               case "catchup_below":
+                       return true;
+               case "catchup_above":
+                       return true;
+               case "email_article":
+                       return true;
+               case "select_all":
+                       return true;
+               case "select_unread":
+                       return true;
+               case "select_marked":
+                       return true;
+               case "select_published":
+                       return true;
+               case "select_invert":
+                       return true;
+               case "select_none":
+                       return true;
+               case "feed_refresh":
+                       return true;
+               case "feed_unhide_read":
+                       return true;
+               case "feed_subscribe":
+                       quickAddFeed();
+                       return true;
+               case "feed_edit":
+                       return true;
+               case "feed_catchup":
+                       return true;
+               case "feed_reverse":
+                       return true;
+               case "catchup_all":
+                       return true;
+               case "cat_toggle_collapse":
+                       return true;
+               case "goto_all":
+                       return true;
+               case "goto_fresh":
+                       return true;
+               case "goto_marked":
+                       return true;
+               case "goto_published":
+                       return true;
+               case "goto_tagcloud":
+                       return true;
+               case "goto_prefs":
+                       return true;
+               case "select_article_cursor":
+                       return true;
+               case "create_label":
+                       return true;
+               case "create_filter":
+                       return true;
+               case "collapse_sidebar":
+                       return true;
+               case "help_dialog":
+                       return true;
+               default:
+                       console.log("unhandled action: " + hotkey_action + "; hotkey: " + hotkey);
+               }
+
+
+/*             if ((keycode == 70 || keycode == 67 || keycode == 71 || keycode == 65)
                                && !hotkey_prefix) {
 
                        var date = new Date();
                        var ts = Math.round(date.getTime() / 1000);
 
-                       hotkey_prefix = keycode;
+                       hotkey_prefix = keychar;
                        hotkey_prefix_pressed = ts;
 
                        cmdline.innerHTML = keychar;
@@ -675,10 +788,12 @@ function hotkey_handler(e) {
                        Element.hide("hotkey_help_overlay");
                }
 
-               /* Global hotkeys */
-
                Element.hide(cmdline);
 
+
+               /* Global hotkeys */
+               return;
+
                if (!hotkey_prefix) {
 
                        if (keycode == 27) { // escape
@@ -687,16 +802,17 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 69) { // e
-                               var id = getActiveArticleId();
-                               emailArticle(id);
+                               emailArticle();
                        }
 
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
-                               if (!Element.visible("hotkey_help_overlay")) {
-                                       Effect.Appear("hotkey_help_overlay", {duration : 0.3, to : 0.9});
-                               } else {
-                                       Element.hide("hotkey_help_overlay");
-                               }
+
+                               new Ajax.Request("backend.php", {
+                                       parameters: "?op=backend&method=help&topic=main",
+                                       onComplete: function(transport) {
+                                               $("hotkey_help_overlay").innerHTML = transport.responseText;
+                                               Effect.Appear("hotkey_help_overlay", {duration : 0.3});
+                                       } });
                                return false;
                        }
 
@@ -793,10 +909,10 @@ function hotkey_handler(e) {
                        if (keycode == 9) { // tab
                                var id = getArticleUnderPointer();
                                if (id) {
-                                       var cb = $("RCHK-" + id);
+                                       var cb = dijit.byId("RCHK-" + id);
 
                                        if (cb) {
-                                               cb.checked = !cb.checked;
+                                               cb.attr("checked", !cb.attr("checked"));
                                                toggleSelectRowById(cb, "RROW-" + id);
                                                return false;
                                        }
@@ -835,11 +951,21 @@ function hotkey_handler(e) {
                                return;
                        }
 
-                       if (keycode == 85) { // u
+                       if (keycode == 85 && !shift_key) { // u
                                selectArticles('unread');
                                return;
                        }
 
+                       if (keycode == 80) { // p
+                               selectArticles('published');
+                               return;
+                       }
+
+                       if (keycode == 85 && shift_key) { // u
+                               selectArticles('marked');
+                               return;
+                       }
+
                        if (keycode == 73) { // i
                                selectArticles('invert');
                                return;
@@ -859,14 +985,14 @@ function hotkey_handler(e) {
                        hotkey_prefix = false;
 
                        if (keycode == 81) { // q
-                               if (getActiveFeedId()) {
+                               if (getActiveFeedId() != undefined) {
                                        catchupCurrentFeed();
                                        return;
                                }
                        }
 
                        if (keycode == 82) { // r
-                               if (getActiveFeedId()) {
+                               if (getActiveFeedId() != undefined) {
                                        viewfeed(getActiveFeedId(), '', activeFeedIsCat());
                                        return;
                                }
@@ -878,12 +1004,22 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 85) { // u
-                               if (getActiveFeedId()) {
+                               if (getActiveFeedId() != undefined) {
                                        viewfeed(getActiveFeedId(), '');
                                        return false;
                                }
                        }
 
+                       if (keycode == 68 && shift_key) { // D
+
+                               window.open("backend.php?op=feeds&method=view&feed=" + getActiveFeedId() +
+                                               "&view_mode=adaptive&order_by=default&update=&m=ForceUpdate&cat=" +
+                                               activeFeedIsCat() + "&DevForceUpdate=1&debug=2&xdebug=2&csrf_token=" +
+                                               getInitParam("csrf_token"));
+
+                               return false;
+                       }
+
                        if (keycode == 69) { // e
 
                                if (activeFeedIsCat())
@@ -908,7 +1044,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 67) { // c
-                               if (getActiveFeedId()) {
+                               if (getActiveFeedId() != undefined) {
                                        catchupCurrentFeed();
                                        return false;
                                }
@@ -1037,45 +1173,6 @@ function reverseHeadlineOrder() {
        }
 }
 
-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&method=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&method=newVersion";