css cleanup; remove auxDlg; add separate prefs.css

[tt-rss.git] / js / viewfeed.js

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 55ebaa7c2280d1dc513964c933bf471d58e833bd..28d4ea8ec5feff0e4abf36d90ae3e47611ea22fe 100644 (file)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -347,8 +347,6 @@ function view(id) {
 
                console.log("cache check result: " + (cached_article != false));
 
-               hideAuxDlg();
-
                var query = "?op=article&method=view&id=" + param_escape(id);
 
                var neighbor_ids = getRelativePostIds(id);
@@ -541,7 +539,7 @@ function moveToPost(mode, noscroll) {
                                        if (!noscroll && article && article.offsetTop + article.offsetHeight >
                                                        ctr.scrollTop + ctr.offsetHeight) {
 
-                                               scrollArticle(ctr.offsetHeight/2);
+                                               scrollArticle(ctr.offsetHeight/4);
 
                                        } else if (next_id) {
                                                cdmExpandArticle(next_id);
@@ -566,7 +564,7 @@ function moveToPost(mode, noscroll) {
                                        if (!getInitParam("cdm_expanded")) {
 
                                                if (!noscroll && article.offsetTop < ctr.scrollTop) {
-                                                       scrollArticle(-ctr.offsetHeight/3);
+                                                       scrollArticle(-ctr.offsetHeight/4);
                                                } else {
                                                        cdmExpandArticle(prev_id);
                                                        cdmScrollToArticleId(prev_id, true);
@@ -578,7 +576,7 @@ function moveToPost(mode, noscroll) {
                                                } else if (!noscroll && prev_article &&
                                                                prev_article.offsetTop < ctr.scrollTop) {
                                                        cdmExpandArticle(prev_id);
-                                                       scrollArticle(-ctr.offsetHeight/3);
+                                                       scrollArticle(-ctr.offsetHeight/4);
                                                } else if (prev_id) {
                                                        cdmExpandArticle(prev_id);
                                                        cdmScrollToArticleId(prev_id, noscroll);
@@ -1190,6 +1188,7 @@ function displaySmallArticlePreview(e, id) {
                                cexc = $("CEXC-" + id);
                                preview = $("small_article_preview");
                                row = $("RROW-" + id);
+                               ctr = $("headlines-frame");
 
                                if (id != getActiveArticleId() && (!isCdmMode() || (cexc && Element.visible(cexc))) && row && preview) {
                                        preview.innerHTML = transport.responseText;
@@ -1197,7 +1196,7 @@ function displaySmallArticlePreview(e, id) {
 
                                        preview.setStyle({
                                                left: (e.clientX + 20) + 'px',
-                                               top: (Element.cumulativeOffset(row)[1] + row.offsetHeight + 10) + 'px' });
+                                               top: (row.offsetTop + row.offsetHeight*2 + 20 - ctr.scrollTop) + 'px' });
 
                                }
 
@@ -1289,7 +1288,7 @@ function headlines_scroll_handler(e) {
 
                                if (!_infscroll_request_sent) {
                                        catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
-                                               2000);
+                                               500);
                                }
                        }
                }
@@ -1432,8 +1431,6 @@ function cdmExpandArticle(id) {
 
                if (!$("RROW-" + id)) return false;
 
-               hideAuxDlg();
-
                var elem = $("CICD-" + getActiveArticleId());
 
                if (id == getActiveArticleId() && Element.visible(elem))
@@ -1642,8 +1639,6 @@ function cdmClicked(event, id) {
        try {
                //var shift_key = event.shiftKey;
 
-               hideAuxDlg();
-
                if (!event.ctrlKey) {
 
                        if (!getInitParam("cdm_expanded")) {
@@ -1919,7 +1914,7 @@ function initHeadlinesMenu() {
                                var bare_id = id.substr(id.indexOf(":")+1);
                                var name = label.name[0];
 
-                               bare_id = -11-bare_id;
+                               bare_id = feed_to_label_id(bare_id);
 
                                labelAddMenu.addChild(new dijit.MenuItem({
                                        label: name,
@@ -2119,3 +2114,4 @@ function displayArticleUrl(id) {
                exception_error("changeScore", e);
        }
 }
+