]> git.wh0rd.org - tt-rss.git/blobdiff - tt-rss.js
unify backend methods updateAllFeeds and getAllCounters
[tt-rss.git] / tt-rss.js
index e4469d8fe2de3074011db0decfb2b1a46fb4a621..a3b18449647dd67b2a2ecfdd55cc4e489da871a3 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -3,10 +3,8 @@ var total_unread = 0;
 var first_run = true;
 var display_tags = false;
 var global_unread = -1;
-var active_title_text = "";
 var current_subtitle = "";
 var daemon_enabled = false;
-var daemon_refresh_only = false;
 //var _qfd_deleted_feed = 0;
 var firsttime_update = true;
 var _active_feed_id = 0;
@@ -27,7 +25,7 @@ function activeFeedIsCat() {
 
 function getActiveFeedId() {
        try {
-               console.log("gAFID: " + _active_feed_id);
+               //console.log("gAFID: " + _active_feed_id);
                return _active_feed_id;
        } catch (e) {
                exception_error("getActiveFeedId", e);
@@ -36,7 +34,7 @@ function getActiveFeedId() {
 
 function setActiveFeedId(id, is_cat) {
        try {
-               console.log("sAFID(" + id + ", " + is_cat + ")");
+               //console.log("sAFID(" + id + ", " + is_cat + ")");
                _active_feed_id = id;
 
                if (is_cat != undefined) {
@@ -87,31 +85,18 @@ function toggleTags(show_all) {
 
 function dlg_frefresh_callback(transport, deleted_feed) {
        if (getActiveFeedId() == deleted_feed) {
-               var h = $("headlines-frame");
-               if (h) {
-                       h.innerHTML = "<div class='whiteBox'>" + __('No feed selected.') + "</div>";
-               }
+               setTimeout("viewfeed(-5)", 100);
        }
 
        setTimeout('updateFeedList(false, false)', 50);
        closeInfoBox();
 }
 
-function scheduleFeedUpdate(force) {
-
-       console.log("in scheduleFeedUpdate");
-
-/*     if (!daemon_enabled && !daemon_refresh_only) {
-               notify_progress("Updating feeds...", true);
-       } */
+function scheduleFeedUpdate() {
 
-       var query_str = "backend.php?op=rpc&subop=";
+       window.clearTimeout(counter_timeout_id);
 
-       if (force) {
-               query_str = query_str + "forceUpdateAllFeeds";
-       } else {
-               query_str = query_str + "updateAllFeeds";
-       }
+       var query_str = "backend.php?op=rpc&subop=getAllCounters";
 
        var omode;
 
@@ -129,7 +114,7 @@ function scheduleFeedUpdate(force) {
        query_str = query_str + "&omode=" + omode;
        query_str = query_str + "&uctr=" + global_unread;
 
-       console.log("REFETCH query: " + query_str);
+       console.log("[scheduleFeedUpdate] " + query_str);
 
        new Ajax.Request("backend.php", {
                parameters: query_str,
@@ -138,39 +123,31 @@ function scheduleFeedUpdate(force) {
                        } });
 }
 
-function updateFeedList(silent, fetch) {
-
-//     if (silent != true) {
-//             notify("Loading feed list...");
-//     }
-
-       console.log("<b>updateFeedList</b>");
-
-       if (offline_mode) return render_offline_feedlist();
-
-       var query_str = "backend.php?op=feeds";
-
-       if (display_tags) {
-               query_str = query_str + "&tags=1";
-       }
-
-       if (getActiveFeedId() && !activeFeedIsCat()) {
-               query_str = query_str + "&actid=" + getActiveFeedId();
-       }
+function updateFeedList() {
+       try {
+               console.log("updateFeedList");
        
-       if (fetch) query_str = query_str + "&fetch=yes";
-
-//     var feeds_frame = $("feeds-frame");
-//     feeds_frame.src = query_str;
-
-       console.log("updateFeedList Q=" + query_str);
-
-       new Ajax.Request("backend.php", {
-               parameters: query_str,
-               onComplete: function(transport) { 
-                       feedlist_callback2(transport); 
-               } });
+               if (offline_mode) return render_offline_feedlist();
+       
+               var query_str = "backend.php?op=feeds";
+       
+               if (display_tags) {
+                       query_str = query_str + "&tags=1";
+               }
+       
+               if (getActiveFeedId() && !activeFeedIsCat()) {
+                       query_str = query_str + "&actid=" + getActiveFeedId();
+               }
+               
+               new Ajax.Request("backend.php", {
+                       parameters: query_str,
+                       onComplete: function(transport) { 
+                               render_feedlist(transport.responseText);
+                       } });
 
+       } catch (e) {
+               exception_error("updateFeedList", e);
+       }
 }
 
 function catchupAllFeeds() {
@@ -217,11 +194,7 @@ function timeout() {
 
        scheduleFeedUpdate(false);
 
-       var refresh_time = getInitParam("feeds_frame_refresh");
-
-       if (!refresh_time) refresh_time = 600; 
-
-       setTimeout("timeout()", refresh_time*1000);
+       setTimeout("timeout()", 10*1000);
 }
 
 function resetSearch() {
@@ -255,10 +228,6 @@ function updateTitle(s) {
                tmp = tmp + " - " + current_subtitle;
        }
 
-       if (active_title_text.length > 0) {
-               tmp = tmp + " > " + active_title_text;
-       }
-
        if (window.fluid) {
                if (global_unread > 0) {
                        window.fluid.dockBadge = global_unread;
@@ -271,9 +240,6 @@ function updateTitle(s) {
 }
 
 function genericSanityCheck() {
-
-//     if (!Ajax.getTransport()) fatalError(1);
-
        setCookie("ttrss_test", "TEST");
        
        if (getCookie("ttrss_test") != "TEST") {
@@ -294,11 +260,6 @@ function init() {
                if (!genericSanityCheck()) 
                        return;
 
-               if (getURLParam('debug')) {
-                       Element.show("debug_output");
-                       console.log('debug mode activated');
-               }
-
                var params = "&ua=" + param_escape(navigator.userAgent);
 
                loading_set_progress(30);
@@ -397,7 +358,6 @@ function init_second_stage() {
 
                delCookie("ttrss_test");
 
-//             document.onresize = resize_headlines;
                window.onresize=resize_headlines;
 
                var toolbar = document.forms["main_toolbar_form"];
@@ -406,22 +366,8 @@ function init_second_stage() {
                dropboxSelect(toolbar.order_by, getInitParam("default_view_order_by"));
 
                daemon_enabled = getInitParam("daemon_enabled") == 1;
-               daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
-/*             var fl = cache_find_param("FEEDLIST", getInitParam("num_feeds"));
-
-               if (fl) {
-                       render_feedlist(fl);
-                       if ($("feedList")) {
-                               request_counters();
-                       } else {
-                               setTimeout('updateFeedList(false, false)', 50);
-                       }
-               } else {
-                       setTimeout('updateFeedList(false, false)', 50);
-               } */
-
                setTimeout('updateFeedList(false, false)', 50);
 
                console.log("second stage ok");
@@ -444,6 +390,9 @@ function init_second_stage() {
 
                enable_offline_reading();
 
+               if (has_local_storage())
+                       localStorage.clear();
+
        } catch (e) {
                exception_error("init_second_stage", e);
        }
@@ -577,11 +526,6 @@ function quickMenuGo(opid) {
        }
 }
 
-function updateFeedTitle(t) {
-       active_title_text = t;
-       updateTitle();
-}
-
 function toggleDispRead() {
        try {
 
@@ -604,18 +548,17 @@ function toggleDispRead() {
 }
 
 function parse_runtime_info(elem) {
-       if (!elem) {
-               console.log("parse_runtime_info: elem is null, aborting");
+
+       if (!elem || !elem.firstChild) {
                return;
        }
 
-       var param = elem.firstChild;
+       var data = JSON.parse(elem.firstChild.nodeValue);
 
-       console.log("parse_runtime_info: " + param);
+       console.log("parsing runtime info...");
 
-       while (param) {
-               var k = param.getAttribute("key");
-               var v = param.getAttribute("value");
+       for (k in data) {
+               var v = data[k];
 
                console.log("RI: " + k + " => " + v);
 
@@ -648,18 +591,8 @@ function parse_runtime_info(elem) {
 
                if (!error_flag) {
                        notify('');
-               }
+               } 
 
-/*             var w = $("noDaemonWarning");
-               
-               if (w) {
-                       if (k == "daemon_is_running" && v != 1) {
-                               w.style.display = "block";
-                       } else {
-                               w.style.display = "none";
-                       }
-               } */
-               param = param.nextSibling;
        }
 }
 
@@ -955,17 +888,6 @@ function hotkey_handler(e) {
 
                if (!hotkey_prefix) {
 
-                       if (keycode == 68 && shift_key) { // d
-                               if (!Element.visible("debug_output")) {
-                                       Element.show("debug_output");
-                                       console.log('debug mode activated');
-                               } else {
-                                       Element.hide("debug_output");
-                               }
-       
-                               return;
-                       }
-       
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
                                if (!Element.visible("hotkey_help_overlay")) {
                                        //Element.show("hotkey_help_overlay");
@@ -1041,18 +963,24 @@ function hotkey_handler(e) {
                                return;
                        }
 
+                       if (keycode == 68 && shift_key) { // shift-D
+                               if (isCdmMode()) {
+                                       //cdmDismissArticle(active_post_id);
+                                       cdmDismissSelectedArticles();
+                               }
+                       }
 
                        if (keycode == 78 || keycode == 40) { // n, down
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('next');
-                                       return;
+                                       return false;
                                }
                        }
        
                        if (keycode == 80 || keycode == 38) { // p, up
                                if (typeof moveToPost != 'undefined') {
                                        moveToPost('prev');
-                                       return;
+                                       return false;
                                }
                        }
 
@@ -1327,3 +1255,8 @@ function reverseHeadlineOrder() {
                exception_error("reverseHeadlineOrder", e);
        }
 }
+
+function showFeedsWithErrors() {
+       displayDlg('feedUpdateErrors');
+}
+