diff options
| author | Richard Beales <[email protected]> | 2013-03-20 07:26:49 +0000 |
|---|---|---|
| committer | Richard Beales <[email protected]> | 2013-03-20 07:26:49 +0000 |
| commit | 04ed8b423abd9046ac4ee6813cf5e98b37aad2a3 (patch) | |
| tree | 5c00a04297478b8b6550c677d8799c404a0fddd7 /js/tt-rss.js | |
| parent | 598a8f37a2ce94186166d1c3b22cc65efdebe4a4 (diff) | |
| parent | 54bc5594ab26ae961bb92c113a1d2815044e450f (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'js/tt-rss.js')
| -rw-r--r-- | js/tt-rss.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/js/tt-rss.js b/js/tt-rss.js index 3b96566f9..c80e8737d 100644 --- 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") { |