From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Jul 2013 08:28:24 +0000 (+0400)
Subject: enable floating title for expandable combined mode, minor expandable mode fixes
X-Git-Tag: 1.9~50^2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=7415fcf2129c4ac0cfd814b0beb917e2372447f1;p=tt-rss.git

enable floating title for expandable combined mode, minor expandable mode fixes
---

diff --git a/css/cdm.css b/css/cdm.css
index c16cf28f..98fd4edf 100644
--- a/css/cdm.css
+++ b/css/cdm.css
@@ -110,6 +110,10 @@ div.cdm.expandable div.cdmHeader span.titleWrap {
 	max-width : 500px;
 }
 
+div.cdm.expandable.active div.cdmHeader span.titleWrap {
+	white-space : normal;
+}
+
 div.cdm.expandable div.cdmHeader a.title {
 	font-weight : bold;
 	color : #555;
diff --git a/js/viewfeed.js b/js/viewfeed.js
index e23db86b..1785fe3f 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -1315,7 +1315,7 @@ function headlines_scroll_handler(e) {
 			if (hsp) hsp.innerHTML = "";
 		}
 
-		if (getInitParam("cdm_expanded") && isCdmMode()) {
+		if (isCdmMode()) {
 			updateFloatingTitle();
 		}
 
@@ -1489,6 +1489,12 @@ function cdmCollapseArticle(event, id, unmark) {
 			if (event) Event.stop(event);
 
 			PluginHost.run(PluginHost.HOOK_ARTICLE_COLLAPSED, id);
+
+			if (row.offsetTop < $("headlines-frame").scrollTop)
+				scrollToRowId(row.id);
+
+			Element.hide("floatingTitle");
+			$("floatingTitle").setAttribute("rowid", false);
 		}
 
 	} catch (e) {