add confirmation to Mark as read action (closes #96)

[tt-rss.git] / tt-rss.js

diff --git a/tt-rss.js b/tt-rss.js
index 9e6d70c73bc629762883b4868aada98e20007e39..0a17c14c3f94937ae9e6eb114e0a3e5083f5c2b3 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -6,6 +6,7 @@ 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 last_refetch = 0;
@@ -14,7 +15,7 @@ var active_feed_id = 0;
 
 var xmlhttp = Ajax.getTransport();
 
-var init_params = new Array();
+var init_params = new Object();
 
 function toggleTags() {
        display_tags = !display_tags;
@@ -81,7 +82,7 @@ function refetch_callback() {
 
                        debug("refetch_callback: done");
 
-                       if (!daemon_enabled) {
+                       if (!daemon_enabled && !daemon_refresh_only) {
                                notify("All feeds updated.");
                                updateTitle("");
                        } else {
@@ -145,7 +146,7 @@ function backend_sanity_check_callback() {
 
 function scheduleFeedUpdate(force) {
 
-       if (!daemon_enabled) {
+       if (!daemon_enabled && !daemon_refresh_only) {
                notify("Updating feeds, please wait.", true);
                updateTitle("Updating");
        }
@@ -365,9 +366,20 @@ function resize_feeds_frame() {
        var f = document.getElementById("feeds-frame");
        var tf = document.getElementById("mainFooter");
        var th = document.getElementById("mainHeader");
-                
-       f.style.height = document.body.scrollHeight - tf.scrollHeight - 
-               th.scrollHeight - 50 + "px";
+
+       var footer_height = 0;
+       var header_height = 0;
+
+       if (tf) {
+               footer_height = tf.scrollHeight;
+       }
+
+       if (th) {
+               header_height = th.scrollHeight;
+       }       
+        
+       f.style.height = document.body.scrollHeight - footer_height - 
+               header_height - 50 + "px";
 }
 
 function init_second_stage() {
@@ -386,7 +398,8 @@ function init_second_stage() {
                dropboxSelect(tb.view_mode, getInitParam("toolbar_view_mode"));
                dropboxSelect(tb.limit, getInitParam("toolbar_limit"));
 
-               daemon_enabled = getInitParam("daemon_enabled");
+               daemon_enabled = getInitParam("daemon_enabled") == 1;
+               daemon_refresh_only = getInitParam("daemon_refresh_only") == 1;
 
                // FIXME should be callled after window resize
 
@@ -522,10 +535,14 @@ function toggleDispRead() {
 function parse_runtime_info(elem) {
        var param = elem.firstChild;
 
+       debug("parse_runtime_info");
+
        while (param) {
                var k = param.getAttribute("key");
                var v = param.getAttribute("value");
 
+               debug("RI: " + k + " => " + v);
+
                var w = document.getElementById("noDaemonWarning");
                
                if (w) {
@@ -538,3 +555,12 @@ function parse_runtime_info(elem) {
                param = param.nextSibling;
        }
 }
+
+function catchupCurrentFeed() {
+
+       var fn = getFeedName(getActiveFeedId());
+       
+       if (confirm("Mark all articles in " + fn + " as read?")) {
+               return viewCurrentFeed(0, 'MarkAllRead')
+       }
+}