daemon2: unbreak spawn interval

[tt-rss.git] / viewfeed.js

diff --git a/viewfeed.js b/viewfeed.js
index 5421ebd883d293abac40b2fc7c4a2e8dd2cb29ef..d51323553b2e28ea9231e738888341728f30bba4 100644 (file)
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -438,8 +438,6 @@ function view(id) {
 
                var query = "?op=view&id=" + param_escape(id);
 
-               var date = new Date();
-
                var neighbor_ids = getRelativePostIds(active_post_id);
 
                /* only request uncached articles */
@@ -462,10 +460,6 @@ function view(id) {
                        query = query + "&omode=flc";
                }
 
-               var date = new Date();
-               var timestamp = Math.round(date.getTime() / 1000);
-               query = query + "&ts=" + timestamp;
-
                query = query + "&cids=" + cids_to_request.toString();
 
                var crow = $("RROW-" + id);
@@ -479,21 +473,6 @@ function view(id) {
 
                if (!cached_article) {
 
-//                     notify_progress("Loading, please wait...", true);
-
-/*                     var content = $('HLC-' + id);
-
-                       if (content && !$('LL-' + id)) {
-                               var ll = document.createElement('img');
-               
-                               ll.src = 'images/indicator_tiny.gif';
-                               ll.className = 'hlLoading';
-                               ll.id = 'LL-' + id;
-
-                               content.appendChild(ll);
-
-                       } */
-
                        var upic = $('FUPDPIC-' + id);
 
                        if (upic) {     
@@ -603,7 +582,6 @@ function toggleMark(id, client_only, no_effects) {
                        }
 
                } else {
-                       //mark_img.src = "images/mark_unset.png";
                        mark_img.alt = __("Please wait...");
                        query = query + "&mark=0";
        
@@ -671,7 +649,6 @@ function togglePub(id, client_only, no_effects, note) {
                        query = query + "&pub=1";
 
                } else {
-                       //mark_img.src = "images/pub_unset.png";
                        mark_img.alt = __("Please wait...");
                        query = query + "&pub=0";
        
@@ -1134,12 +1111,6 @@ function selectionToggleMarked(cdm_mode) {
 
                        query = query + "&afid=" + getActiveFeedId();
 
-/*                     if (tagsAreDisplayed()) {
-                               query = query + "&omode=tl";
-                       } else {
-                               query = query + "&omode=flc";
-                       } */
-
                        query = query + "&omode=lc";
 
                        new Ajax.Request("backend.php", {
@@ -1182,12 +1153,6 @@ function selectionTogglePublished(cdm_mode) {
 
                        query = query + "&afid=" + getActiveFeedId();
 
-/*                     if (tagsAreDisplayed()) {
-                               query = query + "&omode=tl";
-                       } else {
-                               query = query + "&omode=flc";
-                       } */
-
                        query = query + "&omode=lc";
 
                        new Ajax.Request("backend.php", {
@@ -1444,10 +1409,8 @@ function catchupSelection() {
        
                if ($("headlinesList")) {
                        selectionToggleUnread(false, false, 'viewCurrentFeed()', true);
-       //              selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false);
                } else {
                        selectionToggleUnread(true, false, 'viewCurrentFeed()', true)
-       //              cdmSelectArticles('none');
                }
 
        } catch (e) {
@@ -1500,6 +1463,8 @@ function editTagsSave() {
                                                                if (tags) {
                                                                        tags.innerHTML = tags_str.firstChild.nodeValue;
                                                                }
+
+                                                               cache_invalidate(id);
                                                        }
                                                }
                                        }
@@ -1719,7 +1684,6 @@ function cache_inject(id, article, param) {
                if (!cache_check_param(id, param)) {
                        debug("cache_article: miss: " + id + " [p=" + param + "]");
        
-       
                        if (db) {
 
                           var date = new Date();
@@ -1862,7 +1826,7 @@ function cache_expire() {
        }
 }
 
-function cache_empty() {
+function cache_flush() {
        article_cache = new Array();
 }
 
@@ -2217,43 +2181,6 @@ function zoomToArticle(id) {
        }
 }
 
-function showOriginalArticleInline(id) {
-       try {
-
-               var query = "?op=rpc&subop=getArticleLink&id=" + id;
-
-               notify_progress("Loading, please wait...", true);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) { 
-
-                               if (transport.responseXML) {
-                       
-                                       var link = transport.responseXML.getElementsByTagName("link")[0];
-                                       var id = transport.responseXML.getElementsByTagName("id")[0];
-
-                                       notify("");
-
-                                       if (link && id) {
-                                               link = link.firstChild.nodeValue;
-
-                                               var ci = $("content-insert");
-
-                                               var tmp = "<iframe id=\"inline_orig_article\" width=\""+ci.offsetWidth+"\" height=\""+ci.offsetHeight+"\" style=\"border-width : 0px;\" src=\""+link+"\"></iframe>";
-
-                                               render_article(tmp);
-
-                                       }
-                               }
-                       } });
-
-       } catch (e) {
-               exception_error("showOriginalArticleInline", e);
-       }
-}
-
-
 function scrollArticle(offset) {
        try {
                if (!isCdmMode()) {