]> 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 ba4a2bca230e641c4d22c5129335e4b77b5a11a0..67fbea28e4d6d8df677adc743b2253919ee5528b 100644 (file)
@@ -1,7 +1,7 @@
 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;
@@ -41,10 +41,6 @@ function setActiveFeedId(id, is_cat) {
                }
 
                selectFeed(id, is_cat);
-
-               dijit.byId("include_children").attr("disabled", !(is_cat && id > 0));
-
-
        } catch (e) {
                exception_error("setActiveFeedId", e);
        }
@@ -355,13 +351,6 @@ function init_second_stage() {
                dijit.getEnclosingWidget(toolbar.order_by).attr('value',
                        getInitParam("default_view_order_by"));
 
-
-               if (getInitParam("enable_feed_cats") == 0)
-                       Element.hide(dijit.byId("include_children").domNode);
-
-//             dijit.byId("include_children").attr("checked",
-//                     getInitParam("default_include_children"));
-
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
                loading_set_progress(30);
@@ -402,7 +391,7 @@ function quickMenuGo(opid) {
                }
 
                if (opid == "qmcDigest") {
-                       window.location.href = "digest.php";
+                       window.location.href = "backend.php?op=digest";
                        return;
                }
 
@@ -566,6 +555,7 @@ function collapse_feedlist() {
 }
 
 function viewModeChanged() {
+       cache_clear();
        return viewCurrentFeed('');
 }
 
@@ -657,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;
@@ -677,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
@@ -689,8 +802,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 69) { // e
-                               var id = getActiveArticleId();
-                               emailArticle(id);
+                               emailArticle();
                        }
 
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
@@ -797,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;
                                        }
@@ -839,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;
@@ -863,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;
                                }
@@ -882,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())
@@ -912,7 +1044,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 67) { // c
-                               if (getActiveFeedId()) {
+                               if (getActiveFeedId() != undefined) {
                                        catchupCurrentFeed();
                                        return false;
                                }
@@ -1041,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";