diff options
author | Andrew Dolgov <[email protected]> | 2013-07-11 13:00:15 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-07-11 13:00:15 +0400 |
commit | 3e0b262aaac2ab9fdbc7a194f690746b977956e3 (patch) | |
tree | 6558fb3088ec69a010ff4c628115522cd8c4a2e0 /js/viewfeed.js | |
parent | a64ed18150e142c3a1f7f1baf41782a6f9ccdaa8 (diff) | |
parent | 7415fcf2129c4ac0cfd814b0beb917e2372447f1 (diff) |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Diffstat (limited to 'js/viewfeed.js')
-rw-r--r-- | js/viewfeed.js | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/js/viewfeed.js b/js/viewfeed.js index ec7706547..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) { @@ -2230,14 +2236,8 @@ function scrollToRowId(id) { function updateFloatingTitle() { try { var hf = $("headlines-frame"); - var child = $("RROW-" + _active_article_id); - var elems; - - if (getInitParam("cdm_auto_catchup")) - elems = [$$("RROW-" + _active_article_id)]; - else - elems = $$("#headlines-frame > div[id*=RROW]"); + var elems = $$("#headlines-frame > div[id*=RROW]"); for (var i = 0; i < elems.length; i++) { @@ -2255,7 +2255,8 @@ function updateFloatingTitle() { PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, child); } - if (child.offsetTop < hf.scrollTop - header.offsetHeight) + if (child.offsetTop < hf.scrollTop - header.offsetHeight && + child.offsetTop + child.offsetHeight - hf.scrollTop > header.offsetHeight) Element.show("floatingTitle"); else Element.hide("floatingTitle"); |