Merge remote-tracking branch 'upstream/master'

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

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 3b96566f904977494fd89cf02d573611c1f2b280..c80e8737db8fb5cb54665cf46ef15373f04a31c9 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -673,7 +673,15 @@ function hotkey_handler(e) {
                        scrollArticle(-ctr.offsetHeight/3);
                        return false;
                case "close_article":
-                       closeArticlePanel();
+                       if (isCdmMode()) {
+                               if (!getInitParam("cdm_expanded")) {
+                                       cdmCollapseArticle(false, getActiveArticleId());
+                               } else {
+                                       dismissArticle(getActiveArticleId());
+                               }
+                       } else {
+                               closeArticlePanel();
+                       }
                        return false;
                case "email_article":
                        if (typeof emailArticle != "undefined") {