valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moveToPost: implement more natural next/prev moving in combined mode

This commit is contained in:
Andrew Dolgov 2013-02-27 22:27:49 +04:00
parent 1ebf3b979e
commit 104e5c6557
1 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
js/viewfeed.js
View File

@ -549,13 +549,23 @@ function moveToPost(mode) {
} }
if (mode == "next") { if (mode == "next") {
if (next_id) { if (next_id || active_post_id) {
if (isCdmMode()) { if (isCdmMode()) {
cdmExpandArticle(next_id); var article = $("RROW-" + active_post_id);
cdmScrollToArticleId(next_id); var ctr = $("headlines-frame");
} else { if (article && article.offsetTop + article.offsetHeight >
ctr.scrollTop + ctr.offsetHeight) {
scrollArticle(ctr.offsetHeight/2);
} else if (next_id) {
cdmExpandArticle(next_id);
cdmScrollToArticleId(next_id);
}
} else if (next_id) {
correctHeadlinesOffset(next_id); correctHeadlinesOffset(next_id);
view(next_id, getActiveFeedId()); view(next_id, getActiveFeedId());
} }
@ -563,11 +573,23 @@ function moveToPost(mode) {
} }
if (mode == "prev") { if (mode == "prev") {
if (prev_id) { if (prev_id || active_post_id) {
if (isCdmMode()) { if (isCdmMode()) {
cdmExpandArticle(prev_id);
cdmScrollToArticleId(prev_id); var article = $("RROW-" + active_post_id);
} else { var prev_article = $("RROW-" + prev_id);
var ctr = $("headlines-frame");
if (article && article.offsetTop < ctr.scrollTop) {
scrollArticle(-ctr.offsetHeight/2);
} else if (prev_article && prev_article.offsetTop < ctr.scrollTop) {
cdmExpandArticle(prev_id);
scrollArticle(-ctr.offsetHeight/2);
} else if (prev_id) {
cdmExpandArticle(prev_id);
cdmScrollToArticleId(prev_id);
}
} else if (prev_id) {
correctHeadlinesOffset(prev_id); correctHeadlinesOffset(prev_id);
view(prev_id, getActiveFeedId()); view(prev_id, getActiveFeedId());
} }