]> git.wh0rd.org - tt-rss.git/blobdiff - feedlist.js
daemon2: check proper lockfile location in reap_children()
[tt-rss.git] / feedlist.js
index bfd14376c3c393aeafb0c83d7f4966f9cc3b9837..3d9acafd1667e8c4f2f70bae7ee00bb43f5fbacd 100644 (file)
@@ -30,40 +30,6 @@ function viewCategory(cat) {
        return false;
 }
 
-function printFeedEntry(id, title, row_class, unread, icon) {
-
-       var tmp = "";
-       var fctr_class = "";
-       var feed_icon = "";
-
-       if (unread > 0) {
-               row_class += "Unread";
-               fctr_class = "feedCtrHasUnread";
-       } else {
-               fctr_class = "feedCtrNoUnread";
-       }
-
-       if (icon) {
-               feed_icon = "<img id='FIMG-"+id+"' src='" + icon + "'>";
-       } else {
-               feed_icon = "<img id='FIMG-"+id+"' src='images/blank_icon.gif'>";
-       }
-
-       var link = "<a title=\"FIXME\" id=\"FEEDL-"+id+"\""+
-               "href=\"javascript:viewfeed('"+id+"', '', false, '', false, 0);\">"+
-               title + "</a>";
-
-       tmp += "<li id='FEEDR-"+id+"' class="+row_class+">" + feed_icon + 
-               "<span id=\"FEEDN-"+id+"\">" + link + "</span>";
-
-       tmp += " <span class='"+fctr_class+"' id=\"FEEDCTR-"+id+"\">" +
-           "(<span id=\"FEEDU-"+id+"\">"+unread+"</span>)</span>";
-                       
-       tmp += "</li>";
-
-       return tmp;
-}
-
 function render_feedlist(data) {
        try {
 
@@ -80,7 +46,7 @@ function render_feedlist(data) {
 
 function feedlist_callback2(transport) {
        try {
-               debug("feedlist_callback2");
+               console.log("feedlist_callback2");
                if (!transport_error_check(transport)) return;
                render_feedlist(transport.responseText);
        } catch (e) {
@@ -92,7 +58,7 @@ function viewNextFeedPage() {
        try {
                //if (!getActiveFeedId()) return;
 
-               debug("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
+               console.log("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
 
                viewfeed(getActiveFeedId(), undefined, activeFeedIsCat(), undefined,
                        undefined, parseInt(_feed_cur_page+1));
@@ -146,10 +112,10 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        var date = new Date();
                        var timestamp = Math.round(date.getTime() / 1000);
 
-                       debug("<b>" + _infscroll_request_sent + " : " + timestamp + "</b>");
+                       console.log("<b>" + _infscroll_request_sent + " : " + timestamp + "</b>");
 
                        if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
-                               debug("infscroll request in progress, aborting");
+                               console.log("infscroll request in progress, aborting");
                                return;
                        }
 
@@ -172,7 +138,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        toolbar_form.query.value = "";
                }
 
-               var query = "backend.php?op=viewfeed&feed=" + feed + "&" +
+               var query = "?op=viewfeed&feed=" + feed + "&" +
                        toolbar_query + "&subop=" + param_escape(subop);
 
                if ($("search_form")) {
@@ -183,7 +149,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        force_nocache = true;
                }
 
-//             debug("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
+//             console.log("IS_CAT_STORED: " + activeFeedIsCat() + ", IS_CAT: " + is_cat);
 
                if (subop == "MarkAllRead") {
 
@@ -197,14 +163,22 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
        
                                        var feedlist = $('feedList');
                                
-                                       var next_unread_feed = getRelativeFeedId(feedlist,
-                                                       feed, "next", true);
-       
+                                       var next_unread_feed = getRelativeFeedId2(feed, false,
+                                                       "next", true);
+
+                                       /* gRFI2 also returns categories which we don't really 
+                                        * need here, so we skip them */
+
+                                       while (next_unread_feed && next_unread_feed.match("CAT:")) 
+                                               next_unread_feed = getRelativeFeedId2(
+                                                               next_unread_feed.replace("CAT:", ""),
+                                                               true, "next", true);
+                                       
                                        if (!next_unread_feed) {
-                                               next_unread_feed = getRelativeFeedId(feedlist,
-                                                       -3, "next", true);
+                                               next_unread_feed = getRelativeFeedId2(-3, true,
+                                                       "next", true);
                                        }
-               
+       
                                        if (next_unread_feed) {
                                                query = query + "&nuf=" + param_escape(next_unread_feed);
                                                //setActiveFeedId(next_unread_feed);
@@ -240,11 +214,6 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        }
                }
 
-               var date = new Date();
-               var timestamp = Math.round(date.getTime() / 1000);
-               query = query + "&ts=" + timestamp
-               
-               disableContainerChildren("headlinesToolbar", false);
                Form.enable("main_toolbar_form");
 
                // for piggybacked counters
@@ -259,7 +228,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        query = query + "&csync=true";
                }
 
-               debug(query);
+               console.log(query);
 
                var container = $("headlinesInnerContainer");
 
@@ -285,7 +254,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                        }
 
                        cache_check = cache_check_param(cache_prefix + feed, unread_ctr);
-                       debug("headline cache check: " + cache_check);
+                       console.log("headline cache check: " + cache_check);
                }
 
                if (cache_check) {
@@ -329,25 +298,28 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 
                                        if (!is_cat && img) {
 
-                                               img.alt = img.src;
-                                               img.src = 'images/indicator_white.gif';
+                                               if (!img.src.match("indicator_white")) {
+                                                       img.alt = img.src;
+                                                       img.src = getInitParam("sign_progress");
+                                               }
 
                                        } else {
 
-                                               var ll = document.createElement('img');
+                                               if (!$('FLL-' + feed)) {
+                                                       var ll = document.createElement('img');
 
-                                               ll.src = 'images/indicator_tiny.gif';
-                                               ll.className = 'hlLoading';
-                                               ll.id = 'FLL-' + feed;
+                                                       ll.src = getInitParam("sign_progress_tiny");
+                                                       ll.className = 'hlLoading';
+                                                       ll.id = 'FLL-' + feed;
        
-                                               feedr.appendChild(ll);
-
-
+                                                       feedr.appendChild(ll);
+                                               }
                                        }
                                }
                        }
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        headlines_callback2(transport, page_offset); 
                                } });
@@ -387,50 +359,12 @@ function toggleCollapseCat(cat) {
                var cat_list = $("FCATLIST-" + cat).parentNode;
                var caption = $("FCAP-" + cat);
                
-/*             if (cat_list.className.match("invisible")) {
-                       cat_list.className = "";
-                       caption.innerHTML = caption.innerHTML.replace("...", "");
-                       if (cat == 0) {
-                               setCookie("ttrss_vf_uclps", "0");
-                       }
-               } else {
-                       cat_list.className = "invisible";
-                       caption.innerHTML = caption.innerHTML + "...";
-                       if (cat == 0) {
-                               setCookie("ttrss_vf_uclps", "1");
-                       } 
-
-               } */
-
-               if (cat == 0) {
-                       if (Element.visible("FCATLIST-" + cat)) {
-                               setCookie("ttrss_vf_uclps", "1");
-                       } else {
-                               setCookie("ttrss_vf_uclps", "0");
-                       }
-               } 
-
-               if (cat == -2) {
-                       if (Element.visible("FCATLIST-" + cat)) {
-                               setCookie("ttrss_vf_lclps", "1");
-                       } else {
-                               setCookie("ttrss_vf_lclps", "0");
-                       }
-               } 
-
-               if (cat == -1) {
-                       if (Element.visible("FCATLIST-" + cat)) {
-                               setCookie("ttrss_vf_vclps", "1");
-                       } else {
-                               setCookie("ttrss_vf_vclps", "0");
-                       }
-               } 
-
                Effect.toggle('FCATLIST-' + cat, 'blind', { duration: 0.5,
                        afterFinish: toggleCollapseCat_af });
 
-               new Ajax.Request("backend.php?op=feeds&subop=collapse&cid=" + 
-                       param_escape(cat));
+               new Ajax.Request("backend.php", 
+                       { parameters: "backend.php?op=feeds&subop=collapse&cid=" + 
+                               param_escape(cat) } );
 
                local_collapse_cat(cat);
 
@@ -454,12 +388,12 @@ function feedlist_dragsorted(ctr) {
 
                if (ordered_cats.length > 0) {
 
-                       var query = "backend.php?op=feeds&subop=catsort&corder=" + 
+                       var query = "?op=feeds&subop=catsort&corder=" + 
                                param_escape(ordered_cats.toString());
 
-                       debug(query);
+                       console.log(query);
 
-                       new Ajax.Request(query);
+                       new Ajax.Request("backend.php", { parameters: query });
                }
 
        } catch (e) {
@@ -469,12 +403,9 @@ function feedlist_dragsorted(ctr) {
 
 function feedlist_init() {
        try {
-//             if (arguments.callee.done) return;
-//             arguments.callee.done = true;           
-               
                loading_set_progress(90);
 
-               debug("in feedlist init");
+               console.log("in feedlist init");
                
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
                document.onkeydown = hotkey_handler;
@@ -491,7 +422,7 @@ function feedlist_init() {
                }
 
                if (getActiveFeedId()) {
-                       //debug("some feed is open on feedlist refresh, reloading");
+                       //console.log("some feed is open on feedlist refresh, reloading");
                        //setTimeout("viewCurrentFeed()", 100);
                } else {
                        if (getInitParam("cdm_auto_catchup") != 1 && get_feed_unread(-3) > 0) {
@@ -502,7 +433,8 @@ function feedlist_init() {
                        }
                }
 
-               if (getInitParam("theme") == "") {
+               if (getInitParam("theme") == "" || 
+                               getInitParam("theme_options").match("hide_footer")) {
                        setTimeout("hide_footer()", 5000);
                }
 
@@ -551,56 +483,20 @@ function hide_footer() {
        }
 }
 
-/*
-function init_hidden_feedlist(theme) {
+function init_collapsable_feedlist() {
        try {
-               debug("init_hidden_feedlist");
-
-               if (theme != "" && theme != "compact") return;
-
-               var fl = $("feeds-holder");
-               var fh = $("headlines-frame");
-               var fc = $("content-frame");
-               var ft = $("toolbar");
-               var ff = $("footer");
-               var fhdr = $("header");
+               console.log("init_collapsable_feedlist");
 
-               var fbtn = $("toggle_feeds_btn");
-
-               if (fbtn) Element.show(fbtn);
-
-               fl.style.top = fh.offsetTop + "px";
-               fl.style.backgroundColor = "white"; //FIXME
-
-               Element.hide(fl);
-               
-               fh.style.left = "0px";
-               ft.style.left = "0px";
-               if (fc) fc.style.left = "0px";
-               if (ff) ff.style.left = "0px";
-
-               if (theme == "compact") {
-                       fhdr.style.left = "10px";
-                       fl.style.top = (fh.offsetTop + 1) + "px";
-               }
-
-       } catch (e) {
-               exception_error("init_hidden_feedlist", e);
-       }
-} */
-
-function init_collapsable_feedlist(theme) {
-       try {
-               debug("init_collapsable_feedlist");
+               var theme = getInitParam("theme");
+               var options = getInitParam("theme_options");
 
-               if (theme != "" && theme != "compact" && theme != "graycube" &&
-                               theme != "compat") return;
+               if (theme != "" && !options.match("collapse_feedlist")) return;
 
                var fbtn = $("collapse_feeds_btn");
 
                if (fbtn) Element.show(fbtn);
 
-               if (getCookie("ttrss_vf_fclps") == 1) {
+               if (getInitParam("collapsed_feedlist") == 1) {
                        collapse_feedlist();
                }
 
@@ -698,9 +594,9 @@ function request_counters_real() {
 
                if (offline_mode) return;
 
-               debug("requesting counters...");
+               console.log("requesting counters...");
 
-               var query = "backend.php?op=rpc&subop=getAllCounters";
+               var query = "?op=rpc&subop=getAllCounters";
 
                if (tagsAreDisplayed()) {
                        query = query + "&omode=tl";
@@ -708,7 +604,8 @@ function request_counters_real() {
                        query = query + "&omode=flc";
                }
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
                                try {
                                        all_counters_callback2(transport, true);
@@ -736,11 +633,11 @@ function request_counters() {
 //                             timestamp - counters_last_request > 10) {
 
                if (timestamp - counters_last_request > 15) {
-                       debug("scheduling request of counters...");
+                       console.log("scheduling request of counters...");
                        window.setTimeout("request_counters_real()", 1000);
                        counters_last_request = timestamp;
                } else {
-                       debug("request_counters: rate limit reached: " + (timestamp - counters_last_request));
+                       console.log("request_counters: rate limit reached: " + (timestamp - counters_last_request));
                }
 
        } catch (e) {