diff options
author | Andrew Dolgov <[email protected]> | 2013-07-11 12:28:24 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-07-11 12:28:24 +0400 |
commit | 7415fcf2129c4ac0cfd814b0beb917e2372447f1 (patch) | |
tree | 95aba7e904eecea1378ecd4d0d3be40019e05e23 | |
parent | da0f023745730ef2330f458945629e5ceaea89a5 (diff) |
enable floating title for expandable combined mode, minor expandable mode fixes
-rw-r--r-- | css/cdm.css | 4 | ||||
-rw-r--r-- | js/viewfeed.js | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/css/cdm.css b/css/cdm.css index c16cf28f1..98fd4edf6 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 e23db86bd..1785fe3f5 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) { |