From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 25 Apr 2013 10:04:49 +0000 (+0400)
Subject: remove cdmUnexpandArticle
X-Git-Tag: 1.7.9~25^2~85
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=204f9b186ff903bb5638320ba73614a6a89e2d6d;p=tt-rss.git

remove cdmUnexpandArticle
---

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 3f854514..88a360f9 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -309,7 +309,7 @@ function init() {
 				var id = getActiveArticleId();
 				var elem = $("CICD-"+id);
 				if(elem.visible()) {
-					cdmUnexpandArticle(null, id);
+					cdmCollapseArticle(null, id, false);
 				}
 				else {
 					cdmExpandArticle(id);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index da869d92..ada225cb 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1395,8 +1395,10 @@ function catchupRelativeToArticle(below, id) {
 	}
 }
 
-function cdmCollapseArticle(event, id) {
+function cdmCollapseArticle(event, id, unmark) {
 	try {
+		if (unmark == undefined) unmark = true;
+
 		var row = $("RROW-" + id);
 		var elem = $("CICD-" + id);
 
@@ -1407,12 +1409,15 @@ function cdmCollapseArticle(event, id) {
 		  	Element.hide(elem);
 			Element.show("CEXC-" + id);
 			Element.hide(collapse);
-			row.removeClassName("active");
 
-			markHeadline(id, false);
+			if (unmark) {
+				row.removeClassName("active");
+
+				markHeadline(id, false);
 
-			if (id == getActiveArticleId()) {
-				setActiveArticleId(0);
+				if (id == getActiveArticleId()) {
+					setActiveArticleId(0);
+				}
 			}
 
 			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) {
 	try {
 		console.log("cdmExpandArticle " + id);