valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove cdmUnexpandArticle

This commit is contained in:
Andrew Dolgov 2013-04-25 14:04:49 +04:00
parent 2779e22bf5
commit 204f9b186f
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/tt-rss.js
View File

@ -309,7 +309,7 @@ function init() {
var id = getActiveArticleId(); var id = getActiveArticleId();
var elem = $("CICD-"+id); var elem = $("CICD-"+id);
if(elem.visible()) { if(elem.visible()) {
cdmUnexpandArticle(null, id); cdmCollapseArticle(null, id, false);
} }
else { else {
cdmExpandArticle(id); cdmExpandArticle(id);

36
js/viewfeed.js
View File

@ -1395,8 +1395,10 @@ function catchupRelativeToArticle(below, id) {
} }
} }
function cdmCollapseArticle(event, id) { function cdmCollapseArticle(event, id, unmark) {
try { try {
if (unmark == undefined) unmark = true;
var row = $("RROW-" + id); var row = $("RROW-" + id);
var elem = $("CICD-" + id); var elem = $("CICD-" + id);
@ -1407,12 +1409,15 @@ function cdmCollapseArticle(event, id) {
Element.hide(elem); Element.hide(elem);
Element.show("CEXC-" + id); Element.show("CEXC-" + id);
Element.hide(collapse); Element.hide(collapse);
row.removeClassName("active");
markHeadline(id, false); if (unmark) {
row.removeClassName("active");
if (id == getActiveArticleId()) { markHeadline(id, false);
setActiveArticleId(0);
if (id == getActiveArticleId()) {
setActiveArticleId(0);
}
} }
if (event) Event.stop(event); if (event) Event.stop(event);
@ -1425,27 +1430,6 @@ function cdmCollapseArticle(event, id) {
} }
} }
function cdmUnexpandArticle(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);
if (event) Event.stop(event);
}
} catch (e) {
exception_error("cdmUnexpandArticle", e);
}
}
function cdmExpandArticle(id, noexpand) { function cdmExpandArticle(id, noexpand) {
try { try {
console.log("cdmExpandArticle " + id); console.log("cdmExpandArticle " + id);