]> git.wh0rd.org - tt-rss.git/blobdiff - viewfeed.js
neon updates; make more icons themeable; misc fixes
[tt-rss.git] / viewfeed.js
index fa7c56b5f7b98825280ae71b55520e3d9f4ecfa4..5421ebd883d293abac40b2fc7c4a2e8dd2cb29ef 100644 (file)
@@ -48,6 +48,11 @@ function clean_feed_selections() {
 function headlines_callback2(transport, feed_cur_page) {
        try {
 
+               if (!transport.responseText && db) {
+                       offlineConfirmModeChange();
+                       return;
+               }
+
                loading_set_progress(100);
 
                debug("headlines_callback2 [page=" + feed_cur_page + "]");
@@ -68,18 +73,31 @@ function headlines_callback2(transport, feed_cur_page) {
                        }
                }
 
+               var ll = $('FLL-' + feed_id);
+
                if (!is_cat) {
                        var feedr = $("FEEDR-" + feed_id);
                        if (feedr && !feedr.className.match("Selected")) {      
                                feedr.className = feedr.className + "Selected";
                        } 
+                       if (feedr && ll) feedr.removeChild(ll);
                } else {
                        var feedr = $("FCAT-" + feed_id);
                        if (feedr && !feedr.className.match("Selected")) {      
                                feedr.className = feedr.className + "Selected";
                        } 
+
+                       var fcap = $("FCAP-" + feed_id);
+                       if (fcap && ll) fcap.removeChild(ll);
+
                }
-       
+
+               var img = $('FIMG-' + feed_id);
+
+               if (img && !is_cat) {
+                       img.src = img.alt;
+               }
+
                var f = $("headlines-frame");
                try {
                        if (feed_cur_page == 0) { 
@@ -237,8 +255,10 @@ function render_article(article) {
                try {
                        fi.scrollTop = 0;
                } catch (e) { };
-
+               
                fi.innerHTML = article;
+               
+//             article.evalScripts();          
 
        } catch (e) {
                exception_error("render_article", e);
@@ -280,7 +300,9 @@ function showArticleInHeadlines(id) {
                        //
                }
 
-               if (upd_img_pic && upd_img_pic.src.match("updated.png")) {
+               if (upd_img_pic && (upd_img_pic.src.match("updated.png") || 
+                                       upd_img_pic.src.match("fresh_sign.png"))) {
+
                        upd_img_pic.src = "images/blank_icon.gif";
 
                        cache_invalidate(cache_prefix + getActiveFeedId());
@@ -308,14 +330,37 @@ function showArticleInHeadlines(id) {
        }
 }
 
-function article_callback2(transport, id, feed_id) {
+function article_callback2(transport, id) {
        try {
                debug("article_callback2 " + id);
 
+               if (!transport.responseText && db) {
+                       offlineConfirmModeChange();
+                       return;
+               }
+
                if (transport.responseXML) {
 
                        if (!transport_error_check(transport)) return;
 
+/*                     var ll = $('LL-' + id);
+                       var content = $('HLC-' + id);
+
+                       if (ll && content) content.removeChild(ll); */
+                       
+                       var upic = $('FUPDPIC-' + id);
+
+                       if (upic) {
+                               upic.src = 'images/blank_icon.gif';
+                       }
+
+                       if (id != last_requested_article) {
+                               debug("requested article id is out of sequence, aborting");
+                               return;
+                       }
+
+                       active_post_id = id; 
+
                        debug("looking for articles to cache...");
 
                        var articles = transport.responseXML.getElementsByTagName("article");
@@ -333,13 +378,6 @@ function article_callback2(transport, id, feed_id) {
                                cache_inject(a_id, articles[i].firstChild.nodeValue);
                        }
 
-                       if (id != last_requested_article) {
-                               debug("requested article id is out of sequence, aborting");
-                               return;
-                       }
-
-                       active_real_feed_id = feed_id;
-                       active_post_id = id; 
 
                        showArticleInHeadlines(id);     
 
@@ -385,23 +423,20 @@ function article_callback2(transport, id, feed_id) {
        }
 }
 
-function view(id, feed_id, skip_history) {
-       
+function view(id) {
        try {
-               debug("loading article: " + id + "/" + feed_id);
+               debug("loading article: " + id);
 
-               if (offline_mode) return view_offline(id, feed_id);
+               if (offline_mode) return view_offline(id);
 
                var cached_article = cache_find(id);
 
                debug("cache check result: " + (cached_article != false));
        
                enableHotkeys();
-       
-               //setActiveFeedId(feed_id);
+               hideAuxDlg();
 
-               var query = "backend.php?op=view&id=" + param_escape(id) +
-                       "&feed=" + param_escape(feed_id);
+               var query = "?op=view&id=" + param_escape(id);
 
                var date = new Date();
 
@@ -444,7 +479,26 @@ function view(id, feed_id, skip_history) {
 
                if (!cached_article) {
 
-                       notify_progress("Loading, please wait...", true);
+//                     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) {     
+                               upic.src = getInitParam("sign_progress");
+                       }
 
                } else if (cached_article && article_is_unread) {
 
@@ -463,9 +517,10 @@ function view(id, feed_id, skip_history) {
 
                last_requested_article = id;
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
-                               article_callback2(transport, id, feed_id); 
+                               article_callback2(transport, id); 
                        } });
 
                return false;
@@ -521,7 +576,7 @@ function toggleMark(id, client_only, no_effects) {
 
        try {
 
-               var query = "backend.php?op=rpc&id=" + id + "&subop=mark";
+               var query = "?op=rpc&id=" + id + "&subop=mark";
        
                query = query + "&afid=" + getActiveFeedId();
        
@@ -565,12 +620,13 @@ function toggleMark(id, client_only, no_effects) {
 
                }
 
-               update_local_feedlist_counters();
+               if (!no_effects) update_local_feedlist_counters();
 
                if (!client_only) {
                        debug(query);
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -582,13 +638,19 @@ function toggleMark(id, client_only, no_effects) {
        }
 }
 
-function togglePub(id, client_only, no_effects) {
+function togglePub(id, client_only, no_effects, note) {
 
        try {
 
-               var query = "backend.php?op=rpc&id=" + id + "&subop=publ";
+               var query = "?op=rpc&id=" + id + "&subop=publ";
        
                query = query + "&afid=" + getActiveFeedId();
+
+               if (note != undefined) {
+                       query = query + "&note=" + param_escape(note);
+               } else {
+                       query = query + "&note=undefined";
+               }
        
                if (tagsAreDisplayed()) {
                        query = query + "&omode=tl";
@@ -603,11 +665,10 @@ function togglePub(id, client_only, no_effects) {
                var vfeedu = $("FEEDU--2");
                var crow = $("RROW-" + id);
        
-               if (mark_img.src.match("pub_unset")) {
+               if (mark_img.src.match("pub_unset") || note != undefined) {
                        mark_img.src = mark_img.src.replace("pub_unset", "pub_set");
                        mark_img.alt = __("Unpublish article");
                        query = query + "&pub=1";
-       
 
                } else {
                        //mark_img.src = "images/pub_unset.png";
@@ -623,14 +684,36 @@ function togglePub(id, client_only, no_effects) {
                }
 
                if (!client_only) {
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       all_counters_callback2(transport); 
+                                       all_counters_callback2(transport);
+               
+                                       var note = transport.responseXML.getElementsByTagName("note")[0];
+               
+                                       if (note) {
+                                               var note_id = note.getAttribute("id");
+                                               var note_size = note.getAttribute("size");
+                                               var note_content = note.firstChild.nodeValue;
+               
+                                               var container = $('POSTNOTE-' + note_id);
+               
+                                               cache_invalidate(note_id);
+               
+                                               if (container) {
+                                                       if (note_size == "0") {
+                                                               Element.hide(container);
+                                                       } else {
+                                                               container.innerHTML = note_content;
+                                                               Element.show(container);
+                                                       }
+                                               }
+                                       }       
+
                                } });
                }
 
        } catch (e) {
-
                exception_error("togglePub", e);
        }
 }
@@ -848,12 +931,13 @@ function toggleUnread(id, cmode, effect) {
 
                        if (cmode == undefined) cmode = 2;
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                               param_escape(id) + "&cmode=" + param_escape(cmode);
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=" + param_escape(cmode) + "&ids=" + param_escape(id);
 
 //                     notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -879,14 +963,15 @@ function selectionRemoveLabel(id) {
 
 //             if (ok) {
 
-                       var query = "backend.php?op=rpc&subop=removeFromLabel&ids=" +
+                       var query = "?op=rpc&subop=removeFromLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
 //                     notify_progress("Loading, please wait...");
 
                        cache_invalidate("F:" + (-11 - id));
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
                                        all_counters_callback2(transport);
@@ -916,12 +1001,13 @@ function selectionAssignLabel(id) {
 
                        cache_invalidate("F:" + (-11 - id));
 
-                       var query = "backend.php?op=rpc&subop=assignToLabel&ids=" +
+                       var query = "?op=rpc&subop=assignToLabel&ids=" +
                                param_escape(ids.toString()) + "&lid=" + param_escape(id);
 
 //                     notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        show_labels_in_headlines(transport);
                                        all_counters_callback2(transport);
@@ -963,20 +1049,34 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                                        } else {
                                                row.className = nc + "UnreadSelected";
                                        }
+                                       if (db) {
+                                               db.execute("UPDATE articles SET unread = NOT unread WHERE id = ?", 
+                                                       [rows[i]]);
+                                       }
                                }
 
                                if (set_state == false) {
                                        row.className = nc + "Selected";
+                                       if (db) {
+                                               db.execute("UPDATE articles SET unread = 0 WHERE id = ?", 
+                                                       [rows[i]]);
+                                       }
                                }
 
                                if (set_state == true) {
                                        row.className = nc + "UnreadSelected";
+                                       if (db) {
+                                               db.execute("UPDATE articles SET unread = 1 WHERE id = ?", 
+                                                       [rows[i]]);
+                                       }
                                }
                        }
                }
 
                if (rows.length > 0) {
 
+                       update_local_feedlist_counters();
+
                        var cmode = "";
 
                        if (set_state == undefined) {
@@ -987,12 +1087,13 @@ function selectionToggleUnread(cdm_mode, set_state, callback_func, no_error) {
                                cmode = "0";
                        }
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                               param_escape(rows.toString()) + "&cmode=" + cmode;
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=" + cmode + "&ids=" + param_escape(rows.toString()); 
 
                        notify_progress("Loading, please wait...");
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        catchup_callback2(transport, callback_func); 
                                } });
@@ -1024,9 +1125,11 @@ function selectionToggleMarked(cdm_mode) {
                        toggleMark(rows[i], true, true);
                }
 
+               update_local_feedlist_counters();
+
                if (rows.length > 0) {
 
-                       var query = "backend.php?op=rpc&subop=markSelected&ids=" +
+                       var query = "?op=rpc&subop=markSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
                        query = query + "&afid=" + getActiveFeedId();
@@ -1039,7 +1142,8 @@ function selectionToggleMarked(cdm_mode) {
 
                        query = query + "&omode=lc";
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -1073,7 +1177,7 @@ function selectionTogglePublished(cdm_mode) {
 
                if (rows.length > 0) {
 
-                       var query = "backend.php?op=rpc&subop=publishSelected&ids=" +
+                       var query = "?op=rpc&subop=publishSelected&ids=" +
                                param_escape(rows.toString()) + "&cmode=2";
 
                        query = query + "&afid=" + getActiveFeedId();
@@ -1086,7 +1190,8 @@ function selectionTogglePublished(cdm_mode) {
 
                        query = query + "&omode=lc";
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -1202,6 +1307,112 @@ function catchupPage() {
        }
 }
 
+function deleteSelection() {
+
+       try {
+
+               var rows;
+       
+               if ($("headlinesList")) {
+                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+               } else {        
+                       rows = cdmGetSelectedArticles();
+               }
+       
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+       
+       
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+               var str;
+               var op;
+       
+               if (getActiveFeedId() != 0) {
+                       str = __("Delete %d selected articles in %s?");
+               } else {
+                       str = __("Delete %d selected articles?");
+               }
+       
+               str = str.replace("%d", rows.length);
+               str = str.replace("%s", fn);
+       
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
+               }
+
+               query = "?op=rpc&subop=delete&ids=" + param_escape(rows);
+
+               debug(query);
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       viewCurrentFeed();
+                               } });
+
+       } catch (e) {
+               exception_error("deleteSelection", e);
+       }
+}
+
+function archiveSelection() {
+
+       try {
+
+               var rows;
+       
+               if ($("headlinesList")) {
+                       rows = getSelectedTableRowIds("headlinesList", "RROW", "RCHK");
+               } else {        
+                       rows = cdmGetSelectedArticles();
+               }
+       
+               if (rows.length == 0) {
+                       alert(__("No articles are selected."));
+                       return;
+               }
+       
+       
+               var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
+               var str;
+               var op;
+       
+               if (getActiveFeedId() != 0) {
+                       str = __("Archive %d selected articles in %s?");
+                       op = "archive";
+               } else {
+                       str = __("Move %d archived articles back?");
+                       op = "unarchive";
+               }
+       
+               str = str.replace("%d", rows.length);
+               str = str.replace("%s", fn);
+       
+               if (getInitParam("confirm_feed_catchup") == 1 && !confirm(str)) {
+                       return;
+               }
+
+               query = "?op=rpc&subop="+op+"&ids=" + param_escape(rows);
+
+               debug(query);
+
+               for (var i = 0; i < rows.length; i++) {
+                       cache_invalidate(rows[i]);
+               }
+
+               new Ajax.Request("backend.php", {
+                       parameters: query,
+                       onComplete: function(transport) {
+                                       viewCurrentFeed();
+                               } });
+
+       } catch (e) {
+               exception_error("archiveSelection", e);
+       }
+}
+
 function catchupSelection() {
 
        try {
@@ -1245,40 +1456,12 @@ function catchupSelection() {
 }
 
 function editArticleTags(id, feed_id, cdm_enabled) {
-       displayDlg('editArticleTags', id);
-}
-
-
-function tag_saved_callback(transport) {
-       try {
-               debug("in tag_saved_callback");
-
-               closeInfoBox();
-               notify("");
-
-               if (tagsAreDisplayed()) {
-                       _reload_feedlist_after_view = true;
-               }
-
-
-               if (transport.responseXML) {
-                       var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
-                       
-                       if (tags_str) {
-                               var id = tags_str.getAttribute("id");
-
-                               if (id) {
-                                       var tags = $("ATSTR-" + id);
-                                       if (tags) {
-                                               tags.innerHTML = tags_str.firstChild.nodeValue;
-                                       }
-                               }
-                       }
-               }
-
-       } catch (e) {
-               exception_error("tag_saved_callback", e);
-       }
+       displayDlg('editArticleTags', id,
+                          function () {
+                                  new Ajax.Autocompleter('tags_str', 'tags_choices',
+                                          "backend.php?op=rpc&subop=completeTags",
+                                          { tokens: ',', paramName: "search" });
+                          });
 }
 
 function editTagsSave() {
@@ -1289,15 +1472,42 @@ function editTagsSave() {
 
        var query = Form.serialize("tag_edit_form");
 
-       query = "backend.php?op=rpc&subop=setArticleTags&" + query;
+       query = "?op=rpc&subop=setArticleTags&" + query;
 
        debug(query);
 
-       new Ajax.Request(query, {
+       new Ajax.Request("backend.php", {
+               parameters: query,
                onComplete: function(transport) {
-                               tag_saved_callback(transport);
+                               try {
+                                       debug("tags saved...");
+                       
+                                       closeInfoBox();
+                                       notify("");
+                       
+                                       if (tagsAreDisplayed()) {
+                                               _reload_feedlist_after_view = true;
+                                       }                       
+                       
+                                       if (transport.responseXML) {
+                                               var tags_str = transport.responseXML.getElementsByTagName("tags-str")[0];
+                                               
+                                               if (tags_str) {
+                                                       var id = tags_str.getAttribute("id");
+                       
+                                                       if (id) {
+                                                               var tags = $("ATSTR-" + id);
+                                                               if (tags) {
+                                                                       tags.innerHTML = tags_str.firstChild.nodeValue;
+                                                               }
+                                                       }
+                                               }
+                                       }
+                       
+                               } catch (e) {
+                                       exception_error("editTagsSave", e);
+                               }
                        } });
-
 }
 
 function editTagsInsert() {
@@ -1484,10 +1694,11 @@ function cdmWatchdog() {
                                }
                        }
 
-                       var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                               param_escape(ids.toString()) + "&cmode=0";
+                       var query = "?op=rpc&subop=catchupSelected" +
+                               "&cmode=0" + "&ids=" + param_escape(ids.toString());
 
-                       new Ajax.Request(query, {
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
                                        all_counters_callback2(transport); 
                                } });
@@ -1704,24 +1915,6 @@ function cdmClicked(id) {
        } 
 }
 
-function preload_article_callback(transport) {
-       try {
-               if (transport.responseXML) {
-                       var articles = transport.responseXML.getElementsByTagName("article");
-
-                       for (var i = 0; i < articles.length; i++) {
-                               var id = articles[i].getAttribute("id");
-                               if (!cache_check(id)) {
-                                       cache_inject(id, articles[i].firstChild.nodeValue);                             
-                                       debug("preloaded article: " + id);
-                               }
-                       }
-               }
-       } catch (e) {
-               exception_error("preload_article_callback", e);
-       }
-}
-
 function preloadArticleUnderPointer(id) {
        try {
                if (getInitParam("bw_limit") == "1") return;
@@ -1745,11 +1938,21 @@ function preloadArticleUnderPointer(id) {
 
                        cids_to_request.push(id);
 
-                       var query = "backend.php?op=rpc&subop=getArticles&ids=" + 
+                       var query = "?op=rpc&subop=getArticles&ids=" + 
                                cids_to_request.toString();
-                       new Ajax.Request(query, {
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
                                onComplete: function(transport) { 
-                                       preload_article_callback(transport);
+                                       var articles = transport.responseXML.getElementsByTagName("article");
+
+                                       for (var i = 0; i < articles.length; i++) {
+                                               var id = articles[i].getAttribute("id");
+                                               if (!cache_check(id)) {
+                                                       cache_inject(id, articles[i].firstChild.nodeValue);                             
+                                                       debug("preloaded article: " + id);
+                                               }
+                                       }
                        } });
                }
        } catch (e) {
@@ -1784,21 +1987,15 @@ function headlines_scroll_handler() {
 
                var e = $("headlinesInnerContainer");
 
-               // don't do infinite scrolling when Limit == All
-
                var toolbar_form = document.forms["main_toolbar_form"];
 
-               var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
-               if (limit.value != 0) {
-               
-                       debug((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
-                               _infscroll_disable);
+               debug((e.scrollTop + e.offsetHeight) + " vs " + e.scrollHeight + " dis? " +
+                       _infscroll_disable);
 
-                       if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
-                               if (!_infscroll_disable) {
-                                       debug("more cowbell!");
-                                       viewNextFeedPage();
-                               }
+               if (e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
+                       if (!_infscroll_disable) {
+                               debug("more cowbell!");
+                               viewNextFeedPage();
                        }
                }
 
@@ -1865,10 +2062,11 @@ function catchupRelativeToArticle(below) {
                                        e.className = e.className.replace("Unread", "");
                                }
 
-                               var query = "backend.php?op=rpc&subop=catchupSelected&ids=" +
-                                       param_escape(ids_to_mark.toString()) + "&cmode=0";
+                               var query = "?op=rpc&subop=catchupSelected" +
+                                       "&cmode=0" + "&ids=" + param_escape(ids_to_mark.toString()); 
 
-                               new Ajax.Request(query, {
+                               new Ajax.Request("backend.php", {
+                                       parameters: query,
                                        onComplete: function(transport) { 
                                                catchup_callback2(transport); 
                                        } });
@@ -2022,11 +2220,12 @@ function zoomToArticle(id) {
 function showOriginalArticleInline(id) {
        try {
 
-               var query = "backend.php?op=rpc&subop=getArticleLink&id=" + id;
+               var query = "?op=rpc&subop=getArticleLink&id=" + id;
 
                notify_progress("Loading, please wait...", true);
 
-               new Ajax.Request(query, {
+               new Ajax.Request("backend.php", {
+                       parameters: query,
                        onComplete: function(transport) { 
 
                                if (transport.responseXML) {
@@ -2121,3 +2320,18 @@ function toggleHeadlineActions() {
                exception_error("toggleHeadlineActions", e);
        }
 }
+
+function publishWithNote(id, def_note) {
+       try {
+               if (!def_note) def_note = '';
+
+               var note = prompt(__("Please enter a note for this article:"), def_note);
+
+               if (note != undefined) {
+                       togglePub(id, false, false, note);
+               }
+
+       } catch (e) {
+               exception_error("publishWithNote", e);
+       }
+}