public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:05:56 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Richard Beales
2013-03-20 07:26:49 +00:00
parent 598a8f37a2 54bc5594ab
commit 04ed8b423a
37 changed files with 2463 additions and 2298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/tt-rss.js
View File

@@ -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") {