]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
add collapsed CDM mode
[tt-rss.git] / viewfeed.js
index d9b2e22fecb5f3dce3710cade9356a40b091653a..24584e49fc376317d6c39621de9f863b31a008bf 100644 (file)
@@ -22,7 +22,7 @@ function catchup_callback() {
                try {
                        debug("catchup_callback");
                        notify("");                     
-                       all_counters_callback();
+                       all_counters_callback2(xmlhttp_rpc);
                        if (_catchup_callback_func) {
                                setTimeout(_catchup_callback_func, 10); 
                        }
@@ -45,9 +45,32 @@ function catchup_callback2(transport, callback) {
        }
 }
 
-function headlines_callback() {
-       if (xmlhttp.readyState == 4) {
-               debug("headlines_callback");
+function headlines_callback2(transport, active_feed_id, is_cat, feed_cur_page) {
+       try {
+
+               debug("headlines_callback2 [page=" + feed_cur_page + "]");
+
+               var feeds = document.getElementById("feedList").getElementsByTagName("LI");
+
+               for (var i = 0; i < feeds.length; i++) {
+                       if (feeds[i].id && feeds[i].id.match("FEEDR-")) {
+                               feeds[i].className = feeds[i].className.replace("Selected", "");
+                       }                       
+               }
+
+               setActiveFeedId(active_feed_id);
+               
+               if (is_cat != undefined) {
+                       active_feed_is_cat = is_cat;
+               }
+       
+               if (!is_cat) {
+                       var feedr = document.getElementById("FEEDR-" + active_feed_id);
+                       if (feedr && !feedr.className.match("Selected")) {      
+                               feedr.className = feedr.className + "Selected";
+                       } 
+               }
+       
                var f = document.getElementById("headlines-frame");
                try {
                        if (feed_cur_page == 0) { 
@@ -55,13 +78,19 @@ function headlines_callback() {
                                f.scrollTop = 0; 
                        }
                } catch (e) { };
-
-               if (xmlhttp.responseXML) {
-                       var headlines = xmlhttp.responseXML.getElementsByTagName("headlines")[0];
-                       var counters = xmlhttp.responseXML.getElementsByTagName("counters")[0];
-                       var articles = xmlhttp.responseXML.getElementsByTagName("article");
-                       var runtime_info = xmlhttp.responseXML.getElementsByTagName("runtime-info");
-
+       
+               if (transport.responseXML) {
+                       var headlines = transport.responseXML.getElementsByTagName("headlines")[0];
+                       var headlines_count_obj = transport.responseXML.getElementsByTagName("headlines-count")[0];
+       
+                       var headlines_count = headlines_count_obj.getAttribute("value");
+       
+                       if (headlines_count == 0) _infscroll_disable = 1;
+       
+                       var counters = transport.responseXML.getElementsByTagName("counters")[0];
+                       var articles = transport.responseXML.getElementsByTagName("article");
+                       var runtime_info = transport.responseXML.getElementsByTagName("runtime-info");
+       
                        if (feed_cur_page == 0) {
                                if (headlines) {
                                        f.innerHTML = headlines.firstChild.nodeValue;
@@ -72,22 +101,35 @@ function headlines_callback() {
                                }
                        } else {
                                if (headlines) {
-                                       debug("adding some more headlines...");
+                                       if (headlines_count > 0) {
+                                               debug("adding some more headlines...");
+       
+                                               var c = document.getElementById("headlinesList");
+               
+                                               if (!c) {
+                                                       c = document.getElementById("headlinesInnerContainer");
+                                               }
+
+                                               var ids = getSelectedArticleIds2();
+       
+                                               c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
 
-                                       var c = document.getElementById("headlinesList");
+                                               debug("restore selected ids: " + ids);
 
-                                       if (!c) {
-                                               c = document.getElementById("headlinesInnerContainer");
-                                       }
+                                               for (var i = 0; i < ids.length; i++) {
+                                                       markHeadline(ids[i]);
+                                               }
 
-                                       c.innerHTML = c.innerHTML + headlines.firstChild.nodeValue;
+                                       } else {
+                                               debug("no new headlines received");
+                                       }
                                } else {
                                        debug("headlines_callback: returned no data");
                                        notify_error("Error while trying to load more headlines");      
                                }
-
+       
                        }
-
+       
                        if (articles) {
                                for (var i = 0; i < articles.length; i++) {
                                        var a_id = articles[i].getAttribute("id");
@@ -97,32 +139,32 @@ function headlines_callback() {
                        } else {
                                debug("no cached articles received");
                        }
-
+       
                        if (counters) {
                                debug("parsing piggybacked counters: " + counters);
                                parse_counters(counters, false);
                        } else {
                                debug("counters container not found in reply");
                        }
-
+       
                        if (runtime_info) {
                                debug("parsing runtime info: " + runtime_info[0]);
                                parse_runtime_info(runtime_info[0]);
                        } else {
                                debug("counters container not found in reply");
                        }
-
+       
                } else {
                        debug("headlines_callback: returned no XML object");
                        f.innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML object)') + "</div>";
                }
-
+       
                if (typeof correctPNG != 'undefined') {
                        correctPNG();
                }
-
+       
                if (_cdm_wd_timeout) window.clearTimeout(_cdm_wd_timeout);
-
+       
                if (!document.getElementById("headlinesList") && 
                                getInitParam("cdm_auto_catchup") == 1) {
                        debug("starting CDM watchdog");
@@ -131,17 +173,22 @@ function headlines_callback() {
                } else {
                        debug("not in CDM mode or watchdog disabled");
                }
-
+       
                if (_tag_cdm_scroll) {
                        try {
                                document.getElementById("headlinesInnerContainer").scrollTop = _tag_cdm_scroll;
                                _tag_cdm_scroll = false;
                                debug("resetting headlinesInner scrollTop");
-
+       
                        } catch (e) { }
                }
+       
+               _feed_cur_page = feed_cur_page;
+               _infscroll_request_sent = 0;
 
                notify("");
+       } catch (e) {
+               exception_error("headlines_callback2", e);
        }
 }
 
@@ -159,36 +206,66 @@ function render_article(article) {
        }
 }
 
-function article_callback() {
-       if (xmlhttp.readyState == 4) {
-               debug("article_callback");
+function showArticleInHeadlines(id) {
 
-               try {
-                       if (xmlhttp.responseXML) {
-                               var reply = xmlhttp.responseXML.firstChild.firstChild;
+       try {
 
-                               var articles = xmlhttp.responseXML.getElementsByTagName("article");
+               cleanSelected("headlinesList");
+       
+               var crow = document.getElementById("RROW-" + id);
 
-                               for (var i = 0; i < articles.length; i++) {
-                                       var a_id = articles[i].getAttribute("id");
+               if (!crow) return;
 
-                                       debug("found id: " + a_id);
+               var article_is_unread = crow.className.match("Unread");
+                       
+               crow.className = crow.className.replace("Unread", "");
+               
+               var upd_img_pic = document.getElementById("FUPDPIC-" + id);
+               
+               if (upd_img_pic) {
+                       upd_img_pic.src = "images/blank_icon.gif";
+               }
+               
+               selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
+               markHeadline(id);
 
-                                       if (a_id == active_post_id) {
-                                               debug("active article, rendering...");                                  
-                                               render_article(articles[i].firstChild.nodeValue);
-                                       }
+       } catch (e) {
+               exception_error("showArticleInHeadlines", e);
+       }
+}
 
-                                       cache_inject(a_id, articles[i].firstChild.nodeValue);
+function article_callback2(transport, id, feed_id) {
+       try {
+               debug("article_callback2 " + id);
+
+               if (transport.responseXML) {
+
+                       active_real_feed_id = feed_id;
+                       active_post_id = id; 
+
+                       showArticleInHeadlines(id);     
+
+                       var reply = transport.responseXML.firstChild.firstChild;
+
+                       var articles = transport.responseXML.getElementsByTagName("article");
+
+                       for (var i = 0; i < articles.length; i++) {
+                               var a_id = articles[i].getAttribute("id");
+
+                               debug("found id: " + a_id);
+
+                               if (a_id == active_post_id) {
+                                       debug("active article, rendering...");                                  
+                                       render_article(articles[i].firstChild.nodeValue);
                                }
-                       
-                       } else {
-                               debug("article_callback: returned no XML object");
-                               var f = document.getElementById("content-frame");
-                               f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
+
+                               cache_inject(a_id, articles[i].firstChild.nodeValue);
                        }
-               } catch (e) {
-                       exception_error("article_callback", e);
+               
+               } else {
+                       debug("article_callback: returned no XML object");
+                       var f = document.getElementById("content-frame");
+                       f.innerHTML = "<div class='whiteBox'>" + __('Could not display article (missing XML object)') + "</div>";
                }
 
                var date = new Date();
@@ -202,7 +279,7 @@ function article_callback() {
                        setTimeout('updateFeedList(false, false)', 50);                 
                        _reload_feedlist_after_view = false;
                } else {
-                       var counters = xmlhttp.responseXML.getElementsByTagName("counters")[0];
+                       var counters = transport.responseXML.getElementsByTagName("counters")[0];
 
                        if (counters) {
                                debug("parsing piggybacked counters: " + counters);
@@ -213,6 +290,8 @@ function article_callback() {
                }
 
                notify("");
+       } catch (e) {
+               exception_error("article_callback2", e);
        }
 }
 
@@ -220,9 +299,7 @@ function view(id, feed_id, skip_history) {
        
        try {
                debug("loading article: " + id + "/" + feed_id);
-
-               active_real_feed_id = feed_id;
-
+       
                var cached_article = cache_find(id);
 
                debug("cache check result: " + (cached_article != false));
@@ -236,106 +313,61 @@ function view(id, feed_id, skip_history) {
 
                var date = new Date();
 
-               if (!xmlhttp_ready(xmlhttp) && last_article_view < date.getTime() / 1000 - 15) {
-                       debug("<b>xmlhttp seems to be stuck at view, aborting</b>");
-                       xmlhttp.abort();
-                       if (is_safari()) {
-                               debug("trying alternative reset method for Safari");
-                               xmlhttp = Ajax.getTransport();
-                       }
-               }
-
-               if (xmlhttp_ready(xmlhttp)) {
-
-                       active_post_id = id; 
+               var neighbor_ids = getRelativePostIds(active_post_id);
 
-                       cleanSelected("headlinesList");
+               /* only request uncached articles */
 
-                       var crow = document.getElementById("RROW-" + active_post_id);
-
-                       var article_is_unread = crow.className.match("Unread");
-                       debug("article is unread: " + article_is_unread);                       
-
-                       crow.className = crow.className.replace("Unread", "");
-
-                       var upd_img_pic = document.getElementById("FUPDPIC-" + active_post_id);
-
-                       if (upd_img_pic) {
-                               upd_img_pic.src = "images/blank_icon.gif";
-                       }
+               var cids_to_request = Array();
 
-                       selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
-                       markHeadline(active_post_id);
-
-                       var neighbor_ids = getRelativePostIds(active_post_id);
-
-                       /* only request uncached articles */
-
-                       var cids_to_request = Array();
-
-                       for (var i = 0; i < neighbor_ids.length; i++) {
-                               if (!cache_check(neighbor_ids[i])) {
-                                       cids_to_request.push(neighbor_ids[i]);
-                               }
-                       }
-
-                       debug("additional ids: " + cids_to_request.toString());                 
-
-                       /* additional info for piggyback counters */
-
-                       if (tagsAreDisplayed()) {
-                               query = query + "&omode=lt";
-                       } else {
-                               query = query + "&omode=flc";
+               for (var i = 0; i < neighbor_ids.length; i++) {
+                       if (!cache_check(neighbor_ids[i])) {
+                               cids_to_request.push(neighbor_ids[i]);
                        }
+               }
 
-                       var date = new Date();
-                       var timestamp = Math.round(date.getTime() / 1000);
-                       query = query + "&ts=" + timestamp;
-
-                       query = query + "&cids=" + cids_to_request.toString();
-
-                       if (!cached_article) {
+               debug("additional ids: " + cids_to_request.toString());                 
 
-                               notify_progress("Loading, please wait...");
+               /* additional info for piggyback counters */
 
-                               debug(query);
+               if (tagsAreDisplayed()) {
+                       query = query + "&omode=lt";
+               } else {
+                       query = query + "&omode=flc";
+               }
 
-                               xmlhttp.open("GET", query, true);
-                               xmlhttp.onreadystatechange=article_callback;
-                               xmlhttp.send(null);
-                       } else if (cached_article && article_is_unread) {
+               var date = new Date();
+               var timestamp = Math.round(date.getTime() / 1000);
+               query = query + "&ts=" + timestamp;
 
-                               query = query + "&mode=prefetch";
+               query = query + "&cids=" + cids_to_request.toString();
 
-                               debug(query);
+               var crow = document.getElementById("RROW-" + id);
+               var article_is_unread = crow.className.match("Unread");
 
-                               xmlhttp.open("GET", query, true);
-                               xmlhttp.onreadystatechange=article_callback;
-                               xmlhttp.send(null);
+               showArticleInHeadlines(id);
 
-                               render_article(cached_article);
+               if (!cached_article) {
 
-                       } else if (cached_article) {
+                       notify_progress("Loading, please wait...");
 
-                               query = query + "&mode=prefetch_old";
+               } else if (cached_article && article_is_unread) {
 
-                               debug(query);
+                       query = query + "&mode=prefetch";
 
-                               xmlhttp.open("GET", query, true);
-                               xmlhttp.onreadystatechange=article_callback;
-                               xmlhttp.send(null);
+                       render_article(cached_article);
 
-                               render_article(cached_article);
+               } else if (cached_article) {
 
-                       }
+                       query = query + "&mode=prefetch_old";
+                       render_article(cached_article);
+               }
 
-                       cache_expire();
+               cache_expire();
 
-               } else {
-                       debug("xmlhttp busy (@view)");
-                       printLockingError();
-               }  
+               new Ajax.Request(query, {
+                       onComplete: function(transport) { 
+                               article_callback2(transport, id, feed_id); 
+                       } });
 
        } catch (e) {
                exception_error("view", e);
@@ -450,10 +482,6 @@ function toggleMark(id, client_only, no_effects) {
                if (!client_only) {
                        debug(query);
 
-//                     xmlhttp_rpc.open("GET", query, true);
-//                     xmlhttp_rpc.onreadystatechange=all_counters_callback;
-//                     xmlhttp_rpc.send(null);
-
                        new Ajax.Request(query, {
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
@@ -653,11 +681,6 @@ function toggleUnread(id, cmode) {
 
 function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
        try {
-/*             if (!xmlhttp_ready(xmlhttp_rpc)) {
-                       printLockingError();
-                       return;
-               } */
-       
                var rows;
 
                if (cdm_mode) {
@@ -711,16 +734,8 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                        var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=" + cmode;
 
-//                     _catchup_callback_func = callback_func;
-
-                       debug(callback_func);
-
                        notify_progress("Loading, please wait...");
 
-/*                     xmlhttp_rpc.open("GET", query, true);
-                       xmlhttp_rpc.onreadystatechange=catchup_callback;
-                       xmlhttp_rpc.send(null); */
-
                        new Ajax.Request(query, {
                                onComplete: function(transport) { 
                                        catchup_callback2(transport, callback_func); 
@@ -949,8 +964,9 @@ function catchupSelection() {
        
                var fn = getFeedName(getActiveFeedId(), active_feed_is_cat);
                
-               var str = __("Mark all selected articles in %s as read?");
+               var str = __("Mark %d selected articles in %s as read?");
        
+               str = str.replace("%d", rows.length);
                str = str.replace("%s", fn);
        
                if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
@@ -987,12 +1003,12 @@ function labelFromSearch(search, search_mode, match_on, feed_id, is_cat) {
                        "&title=" + param_escape(title);
 
                debug("LFS: " + query);
-       
-               xmlhttp_rpc.open("GET", query, true);
-               xmlhttp_rpc.onreadystatechange=dlg_frefresh_callback;
-               xmlhttp_rpc.send(null);
-       }
 
+               new Ajax.Request(query, {
+                       onComplete: function(transport) {
+                                       dlg_frefresh_callback(transport);
+                               } });
+       }
 }
 
 function editArticleTags(id, feed_id, cdm_enabled) {
@@ -1009,40 +1025,34 @@ function editArticleTags(id, feed_id, cdm_enabled) {
 }
 
 
-function tag_saved_callback() {
-       if (xmlhttp_rpc.readyState == 4) {
-               try {
-                       debug("in tag_saved_callback");
+function tag_saved_callback(transport) {
+       try {
+               debug("in tag_saved_callback");
 
-                       closeInfoBox();
-                       notify("");
+               closeInfoBox();
+               notify("");
 
-                       if (tagsAreDisplayed()) {
-                               _reload_feedlist_after_view = true;
-                       }
+               if (tagsAreDisplayed()) {
+                       _reload_feedlist_after_view = true;
+               }
 
-                       if (!_tag_active_cdm) {
-                               if (active_post_id == _tag_active_post_id) {
-                                       debug("reloading current article");
-                                       view(_tag_active_post_id, _tag_active_feed_id);                 
-                               }
-                       } else {
-                               debug("reloading current feed");
-                               viewCurrentFeed();
+               if (!_tag_active_cdm) {
+                       if (active_post_id == _tag_active_post_id) {
+                               debug("reloading current article");
+                               view(_tag_active_post_id, _tag_active_feed_id);                 
                        }
-
-               } catch (e) {
-                       exception_error("catchup_callback", e);
+               } else {
+                       debug("reloading current feed");
+                       viewCurrentFeed();
                }
+
+       } catch (e) {
+               exception_error("catchup_callback", e);
        }
 }
 
 function editTagsSave() {
 
-       if (!xmlhttp_ready(xmlhttp_rpc)) {
-               printLockingError();
-       }
-
        notify_progress("Saving article tags...");
 
        var form = document.forms["tag_edit_form"];
@@ -1053,9 +1063,10 @@ function editTagsSave() {
 
        debug(query);
 
-       xmlhttp_rpc.open("GET", query, true);                   
-       xmlhttp_rpc.onreadystatechange=tag_saved_callback;
-       xmlhttp_rpc.send(null);
+       new Ajax.Request(query, {
+               onComplete: function(transport) {
+                               tag_saved_callback(transport);
+                       } });
 
 }
 
@@ -1249,10 +1260,18 @@ function headlines_scroll_handler() {
 
                var e = document.getElementById("headlinesInnerContainer");
 
-               if (e.scrollTop + e.offsetHeight > e.scrollHeight - 300) {
-                       debug("more cowbell!");
+               // don't do infinite scrolling when Limit == All
 
-                       viewNextFeedPage();
+               var toolbar_form = document.forms["main_toolbar_form"];
+
+               var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
+               if (limit.value != 0) {
+                       if (e.scrollTop + e.offsetHeight > e.scrollHeight - 50) {
+                               if (!_infscroll_disable) {
+                                       debug("more cowbell!");
+                                       viewNextFeedPage();
+                               }
+                       }
                }
 
        } catch (e) {
@@ -1324,10 +1343,11 @@ function catchupRelativeToArticle(below) {
                                var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
                                        param_escape(ids_to_mark.toString()) + "&cmode=0";
 
-                               xmlhttp_rpc.open("GET", query, true);
-                               xmlhttp_rpc.onreadystatechange=catchup_callback;
-                               xmlhttp_rpc.send(null);
-       
+                               new Ajax.Request(query, {
+                                       onComplete: function(transport) { 
+                                               catchup_callback2(transport); 
+                                       } });
+
                        }
                }
 
@@ -1335,3 +1355,25 @@ function catchupRelativeToArticle(below) {
                exception_error("catchupRelativeToArticle", e);
        }
 }
+
+function cdmExpandArticle(a_id) {
+       try {
+               var id = 'CICD-' + a_id;
+
+               Effect.Appear(id, {duration : 0.5, 
+                       beforeStart: function(effect) { 
+                               var h_id = 'CICH-' + a_id;
+                               var h_elem = document.getElementById(h_id);
+                               if (h_elem) { h_elem.style.display = "none"; }
+
+                               toggleUnread(a_id, 0);
+                       }});
+
+
+       } catch (e) {
+               exception_error("appearBlockElementF", e);
+       }
+
+}
+
+