public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 19:05:55 +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") {

48
js/viewfeed.js
View File

@@ -1312,9 +1312,38 @@ function catchupRelativeToArticle(below, id) {
}
}
function cdmCollapseArticle(event, id) {
try {
var row = $("RROW-" + id);
var elem = $("CICD-" + id);
if (elem && row) {
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 {
console.log("cdmExpandArticle " + id);
hideAuxDlg();
var elem = $("CICD-" + getActiveArticleId());
@@ -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;
@@ -1609,16 +1646,21 @@ 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");
if (marked)
row.addClassName("Selected");
else
row.removeClassName("Selected");
}
}