diff options
| -rw-r--r-- | classes/feeds.php | 5 | ||||
| -rw-r--r-- | images/collapse.png | bin | 0 -> 186 bytes | |||
| -rw-r--r-- | include/functions.php | 2 | ||||
| -rw-r--r-- | js/tt-rss.js | 10 | ||||
| -rw-r--r-- | js/viewfeed.js | 44 | ||||
| -rw-r--r-- | tt-rss.css | 4 |
6 files changed, 60 insertions, 5 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 297cad300..0d5d8c8a0 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -548,6 +548,10 @@ class Feeds extends Handler_Protected { $reply['content'] .= $labels_str; + $reply['content'] .= "<span class='collapseBtn' style='display : none'> + <img src=\"images/collapse.png\" onclick=\"cdmCollapseArticle(event, $id)\" + title=\"".__("Collapse article")."\"/></span>"; + if (!$expand_cdm) $content_hidden = "style=\"display : none\""; else @@ -555,7 +559,6 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<span $excerpt_hidden id=\"CEXC-$id\" class=\"cdmExcerpt\"> - $content_preview</span>"; - $reply['content'] .= "</span>"; if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { diff --git a/images/collapse.png b/images/collapse.png Binary files differnew file mode 100644 index 000000000..5adbd5e1c --- /dev/null +++ b/images/collapse.png diff --git a/include/functions.php b/include/functions.php index 3b73ed5f7..62699e175 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1889,7 +1889,7 @@ "article_scroll_up" => __("Scroll up"), "select_article_cursor" => __("Select article under cursor"), "email_article" => __("Email article"), - "close_article" => __("Close article"), + "close_article" => __("Close/collapse article"), "toggle_widescreen" => __("Toggle widescreen mode")), __("Article selection") => array( "select_all" => __("Select all articles"), diff --git a/js/tt-rss.js b/js/tt-rss.js index e9bc9d412..bced92674 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -669,7 +669,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") { diff --git a/js/viewfeed.js b/js/viewfeed.js index 9a16befff..584fff574 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1312,6 +1312,35 @@ function catchupRelativeToArticle(below, id) { } } +function cdmCollapseArticle(event, id) { + try { + var row = $("RROW-" + id); + var elem = $("CICD-" + id); + + if (elem && row) { + row.removeClassName("Selected"); + + var collapse = $$("div#RROW-" + id + + " span[class='collapseBtn']")[0]; + + Element.hide(elem); + Element.show("CEXC-" + id); + Element.hide(collapse); + + markHeadline(id, false); + + if (id == getActiveArticleId()) { + setActiveArticleId(0); + } + + if (event) Event.stop(event); + } + + } catch (e) { + exception_error("cdmCollapseArticle", e); + } +} + function cdmExpandArticle(id) { try { @@ -1327,17 +1356,25 @@ function cdmExpandArticle(id) { var old_offset = $("RROW-" + id).offsetTop; if (getActiveArticleId() && elem && !getInitParam("cdm_expanded")) { + var collapse = $$("div#RROW-" + getActiveArticleId() + + " span[class='collapseBtn']")[0]; + Element.hide(elem); Element.show("CEXC-" + getActiveArticleId()); + Element.hide(collapse); } setActiveArticleId(id); elem = $("CICD-" + id); + var collapse = $$("div#RROW-" + id + + " span[class='collapseBtn']")[0]; + if (!Element.visible(elem)) { Element.show(elem); Element.hide("CEXC-" + id); + Element.show(collapse); } /* var new_offset = $("RROW-" + id).offsetTop; @@ -1514,6 +1551,7 @@ function cdmClicked(event, id) { if (!event.ctrlKey) { if (!getInitParam("cdm_expanded")) { + if (event) Event.stop(event); return cdmExpandArticle(id); } else { @@ -1609,13 +1647,15 @@ function isCdmMode() { return getInitParam("combined_display_mode"); } -function markHeadline(id) { +function markHeadline(id, marked) { + if (marked == undefined) marked = true; + var row = $("RROW-" + id); if (row) { var check = dijit.byId("RCHK-" + id); if (check) { - check.attr("checked", true); + check.attr("checked", marked); } row.addClassName("Selected"); diff --git a/tt-rss.css b/tt-rss.css index 72e73e0d3..545d8c8d1 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -1189,3 +1189,7 @@ ul.helpKbList h2 { .dijitTreeNode .loadingNode { margin-left : 3px; } + +span.collapseBtn { + cursor : pointer; +} |
