diff options
author | Andrew Dolgov <[email protected]> | 2010-09-12 20:29:10 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-09-12 20:29:10 +0400 |
commit | eb4f33ec0270d2d97ff75818c2654140cc285872 (patch) | |
tree | 82fc942e887ae2ea56e5b7a21fff1eef07132fe0 | |
parent | d3f1300032fd6b0faabddbe58655401582a0dd54 (diff) |
digest: more loading prompts
-rw-r--r-- | digest.css | 4 | ||||
-rw-r--r-- | digest.js | 44 |
2 files changed, 31 insertions, 17 deletions
diff --git a/digest.css b/digest.css index 4d50b4c45..9041f7416 100644 --- a/digest.css +++ b/digest.css @@ -214,6 +214,10 @@ a:hover { padding-left : 21px; } +#headlines ul#headlines-content img#H-LOADING-IMG { + margin-left : 5px; +} + #headlines ul#headlines-content div.excerpt { color : #404040; cursor : pointer; @@ -43,25 +43,30 @@ function catchup_feed(feed_id, callback) { function catchup_visible_articles(callback) { try { - var elems = $("headlines-content").getElementsByTagName("LI"); - var ids = []; - - for (var i = 0; i < elems.length; i++) { - if (elems[i].id && elems[i].id.match("A-")) { - ids.push(elems[i].id.replace("A-", "")); - } - } - var query = "?op=rpc&subop=catchupSelected" + - "&cmode=0&ids=" + param_escape(ids); - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - if (callback) callback(transport); + if (confirm(__("Mark all displayed articles as read?"))) { - viewfeed(_active_feed_id, 0); - } }); + var elems = $("headlines-content").getElementsByTagName("LI"); + var ids = []; + + for (var i = 0; i < elems.length; i++) { + if (elems[i].id && elems[i].id.match("A-")) { + ids.push(elems[i].id.replace("A-", "")); + } + } + + var query = "?op=rpc&subop=catchupSelected" + + "&cmode=0&ids=" + param_escape(ids); + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + + viewfeed(_active_feed_id, 0); + } }); + + } } catch (e) { exception_error("catchup_visible_articles", e); @@ -215,6 +220,8 @@ function viewfeed(feed_id, offset, replace, no_effects) { img.setAttribute("orig_src", img.src); img.src = 'images/indicator_tiny.gif'; + if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG"); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -223,6 +230,7 @@ function viewfeed(feed_id, offset, replace, no_effects) { set_selected_feed(feed_id); _active_feed_offset = offset; img.src = img.getAttribute("orig_src"); + if ($('H-LOADING-IMG')) Element.hide("H-LOADING-IMG"); } }); } catch (e) { @@ -498,6 +506,8 @@ function parse_headlines(transport, replace, no_effects) { __("Mark as read") + "</a> | " + "<a href=\"javascript:load_more()\">" + __("Load more...") + "</a>" + + "<img style=\"display : none\" "+ + "id=\"H-LOADING-IMG\" src='images/indicator_tiny.gif'>" + "</div></li>"; } |