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

diff --git a/css/cdm.css b/css/cdm.css
index c16cf28f16df95cb2e34b10b1dc6fbfe7f67006b..98fd4edf6e71afe99e281180699ef24f8b2f1b6d 100644 (file)
--- 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 e23db86bdc4438bfb5164901abd44fd71604879b..1785fe3f5fd1d16dd0f4ec84822b7b01d9dfe256 100644 (file)
--- 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) {