pngcrush.sh

[tt-rss.git] / js / tt-rss.js

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 95ce23ffe1bd407f8c51778ff8858b4283b3359f..e29580c8a9582c273f7aa17785ee93b40b98578e 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -335,7 +335,11 @@ function init_hotkey_actions() {
                scrollArticle(-40);
        };
        hotkey_actions["close_article"] = function() {
-               closeArticlePanel();
+               if (isCdmMode()) {
+                       cdmCollapseActive();
+               } else {
+                       closeArticlePanel();
+               }
        };
        hotkey_actions["email_article"] = function() {
                if (typeof emailArticle != "undefined") {
@@ -443,10 +447,12 @@ function init_hotkey_actions() {
 
                        if (row) {
                                const cb = dijit.getEnclosingWidget(
-                                       row.getElementsByClassName("rchk")[0]);
+                                       row.select(".rchk")[0]);
 
                                if (cb) {
-                                       cb.attr("checked", !cb.attr("checked"));
+                                       if (!row.hasClassName("active"))
+                                               cb.attr("checked", !cb.attr("checked"));
+
                                        toggleSelectRowById(cb, "RROW-" + id);
                                        return false;
                                }
@@ -499,6 +505,20 @@ function init_hotkey_actions() {
                        viewCurrentFeed();
                })
        };
+       hotkey_actions["toggle_cdm_expanded"] = function() {
+               notify_progress("Loading, please wait...");
+
+               const value = getInitParam("cdm_expanded") ? "false" : "true";
+               const 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() {