From c01f40f4d9c8fae847ecec5a18ff52c0a15dd57b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 16:50:10 +0400 Subject: add experimental digest thingie (2) --- digest.js | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 digest.js (limited to 'digest.js') diff --git a/digest.js b/digest.js new file mode 100644 index 000000000..7bfd9df27 --- /dev/null +++ b/digest.js @@ -0,0 +1,108 @@ +var last_feeds = []; + +function find_feed(feeds, feed_id) { + try { + for (var i = 0; i < feeds.length; i++) { + if (feeds[i].id == feed_id) + return feeds[i]; + } + + return false; + + } catch (e) { + exception_error("find_feed", e); + } +} + +function add_feed_entry(feed) { + try { + var icon_part = ""; + + if (feed.has_icon) + icon_part = "zz"; + + var tmp_html = "
  • " + + icon_part + + feed.title + + "
    " + feed.unread + "
    " + + "
    • "; + + $("feeds-content").innerHTML += tmp_html; + + } catch (e) { + exception_error("add_feed_entry", e); + } +} + +function add_latest_entry(article) { + try { + + } catch (e) { + exception_error("add_latest_entry", e); + } +} + +function add_headline_entry(article, feed) { + try { + + var icon_part = ""; + + if (article.has_icon) + icon_part = "zz"; + + var tmp_html = "
  • " + + icon_part + + "" + article.title + "" + + "
    " + article.excerpt + "
    " + + "
    " + feed.title + " " + " @ " + + article.updated + "
    " + + "
    • "; + + $("headlines-content").innerHTML += tmp_html; + + } catch (e) { + exception_error("add_headline_entry", e); + } +} + +function digest_update(transport) { + try { + var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + + if (feeds) { + last_feeds = feeds; + + feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + + for (var i = 0; i < feeds.length; i++) { + add_feed_entry(feeds[i]); + } + } + + if (headlines) { + headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + + for (var i = 0; i < headlines.length; i++) { + add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + } + } + + } catch (e) { + exception_error("digest_update", e); + } + } + +function digest_init() { + try { + + new Ajax.Request("backend.php", { + parameters: "backend.php?op=rpc&subop=digest-init", + onComplete: function(transport) { + digest_update(transport); + } }); + + } catch (e) { + exception_error("digest_init", e); + } +} -- cgit v1.2.3 From b41c254984df3fcb9fc7db4bb5218f2391e62164 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 19:02:12 +0400 Subject: small digest page improvements --- digest.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 5 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 7bfd9df27..3d58ca95f 100644 --- a/digest.js +++ b/digest.js @@ -1,5 +1,19 @@ var last_feeds = []; +function view(feed_id) { + try { + + new Ajax.Request("backend.php", { + parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id, + onComplete: function(transport) { + digest_update(transport); + } }); + + } catch (e) { + exception_error("view", e); + } +} + function find_feed(feeds, feed_id) { try { for (var i = 0; i < feeds.length; i++) { @@ -14,16 +28,40 @@ function find_feed(feeds, feed_id) { } } +function get_feed_icon(feed) { + try { + if (feed.has_icon) + return 'icons/' + feed.id + '.ico'; + + if (feed.id == -1) + return 'images/mark_set.png'; + + if (feed.id == -2) + return 'images/pub_set.png'; + + if (feed.id == -3) + return 'images/fresh.png'; + + if (feed.id == -4) + return 'images/tag.png'; + + if (feed.id < -10) + return 'images/label.png'; + + } catch (e) { + exception_error("get_feed_icon", e); + } +} + function add_feed_entry(feed) { try { var icon_part = ""; - if (feed.has_icon) - icon_part = "zz"; + icon_part = ""; var tmp_html = "
  • " + icon_part + - feed.title + + "" + feed.title + "
    " + feed.unread + "
    " + "
    • "; @@ -34,8 +72,11 @@ function add_feed_entry(feed) { } } -function add_latest_entry(article) { +function add_latest_entry(article, feed) { try { + + + //$("latest-content").innerHTML += "bbb"; } catch (e) { exception_error("add_latest_entry", e); @@ -55,7 +96,7 @@ function add_headline_entry(article, feed) { "" + article.title + "" + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + - article.updated + "
    " + + new Date(article.updated * 1000) + "" + ""; $("headlines-content").innerHTML += tmp_html; @@ -75,6 +116,8 @@ function digest_update(transport) { feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + $('feeds-content').innerHTML = ""; + for (var i = 0; i < feeds.length; i++) { add_feed_entry(feeds[i]); } @@ -83,9 +126,13 @@ function digest_update(transport) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + $('headlines-content').innerHTML = ""; + for (var i = 0; i < headlines.length; i++) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } + + $('headlines-content').innerHTML += "
  • More articles...
    • "; } } catch (e) { -- cgit v1.2.3 From 1ca8997bcc818bdfa12f3c979b9e0981422cdbc0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 21:44:04 +0400 Subject: more digest page improvements --- digest.js | 45 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 9 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 3d58ca95f..f27f15f86 100644 --- a/digest.js +++ b/digest.js @@ -1,12 +1,29 @@ var last_feeds = []; -function view(feed_id) { +var _active_feed_id = false; +var _active_feed_offset = false; + +function viewfeed(feed_id, offset) { try { + if (!feed_id) feed_id = _active_feed_id; + + if (!offset) + offset = 0; + else + offset = _active_feed_offset + offset; + + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + + "&offset=" + offset; + + console.log(query); + new Ajax.Request("backend.php", { - parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id, + parameters: query, onComplete: function(transport) { digest_update(transport); + _active_feed_id = feed_id; + _active_feed_offset = offset; } }); } catch (e) { @@ -61,7 +78,7 @@ function add_feed_entry(feed) { var tmp_html = "
  • " + icon_part + - "" + feed.title + + "" + feed.title + "
    " + feed.unread + "
    " + "
    • "; @@ -89,15 +106,15 @@ function add_headline_entry(article, feed) { var icon_part = ""; if (article.has_icon) - icon_part = "zz"; + icon_part = ""; var tmp_html = "
  • " + icon_part + "" + article.title + "" + - "
    " + article.excerpt + "
    " + + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + - "
    • "; + ""; $("headlines-content").innerHTML += tmp_html; @@ -112,15 +129,17 @@ function digest_update(transport) { var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; if (feeds) { - last_feeds = feeds; - feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + last_feeds = feeds; + $('feeds-content').innerHTML = ""; for (var i = 0; i < feeds.length; i++) { add_feed_entry(feeds[i]); } + } else { + feeds = last_feeds; } if (headlines) { @@ -128,11 +147,18 @@ function digest_update(transport) { $('headlines-content').innerHTML = ""; + Element.hide('headlines-content'); + for (var i = 0; i < headlines.length; i++) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } - $('headlines-content').innerHTML += "
  • More articles...
    • "; + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; + + new Effect.Appear('headlines-content'); + } } catch (e) { @@ -147,6 +173,7 @@ function digest_init() { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { digest_update(transport); + window.setTimeout('viewfeed(-4)', 100); } }); } catch (e) { -- cgit v1.2.3 From 22933e5e381f241365d833a7e1da6185816688bf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 9 Sep 2010 22:01:35 +0400 Subject: more digest page improvements --- digest.js | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index f27f15f86..d641733f0 100644 --- a/digest.js +++ b/digest.js @@ -3,6 +3,16 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; +function view(article_id) { + try { + new Effect.Fade('A-' + article_id, {duration : 0.3}); + + return true; + } catch (e) { + exception_error("view", e); + } +} + function viewfeed(feed_id, offset) { try { @@ -108,9 +118,11 @@ function add_headline_entry(article, feed) { if (article.has_icon) icon_part = ""; - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + - "" + article.title + "" + + "" + + article.title + "" + "
    " + article.excerpt + "
    " + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + @@ -153,9 +165,9 @@ function digest_update(transport) { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); } - $('headlines-content').innerHTML += "
  • " + - "
    " + - __("More articles...") + "
    • "; +// $('headlines-content').innerHTML += "
  • " + +// "
    " + +// __("More articles...") + "
    • "; new Effect.Appear('headlines-content'); -- cgit v1.2.3 From 118e9399b7896472af1f3e3c349c35a9a94072b1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Sep 2010 13:59:21 +0400 Subject: more digest page improvements --- digest.js | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 116 insertions(+), 13 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index d641733f0..01f96a54e 100644 --- a/digest.js +++ b/digest.js @@ -2,12 +2,81 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; +var _update_timeout = false; -function view(article_id) { +function zoom(article_id) { try { - new Effect.Fade('A-' + article_id, {duration : 0.3}); + var elem = $('A-' + article_id); - return true; + if (elem) { + var divs = elem.getElementsByTagName('DIV'); + + for (var i = 0; i < divs.length; i++) { + if (divs[i].className == 'excerpt') + Element.hide(divs[i]); + + if (divs[i].className == 'content') + Element.show(divs[i]); + } + } + + var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.clearTimeout(_update_timeout); + _update_timeout = window.setTimeout('update()', 1000); + } }); + + } catch (e) { + exception_error("zoom", e); + } +} + +function load_more() { + try { + var elem = $('MORE-PROMPT'); + + if (elem) { + elem.id = ''; + Element.hide(elem); + } + + viewfeed(_active_feed_id, _active_feed_offset + 10); + } catch (e) { + exception_error("load_more", e); + } +} + +function update() { + try { + viewfeed(_active_feed_id, _active_feed_offset); + } catch (e) { + exception_error("update", e); + } +} + +function view(article_id, dismiss_only) { + try { + var elem = $('A-' + article_id); + + elem.id = ''; + + //new Effect.Fade(elem, {duration : 0.3}); + + Element.hide(elem); + + var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + window.clearTimeout(_update_timeout); + _update_timeout = window.setTimeout('update()', 1000); + } }); + + return dismiss_only != true; } catch (e) { exception_error("view", e); } @@ -31,7 +100,7 @@ function viewfeed(feed_id, offset) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - digest_update(transport); + digest_update(transport, feed_id); _active_feed_id = feed_id; _active_feed_offset = offset; } }); @@ -41,6 +110,20 @@ function viewfeed(feed_id, offset) { } } +function find_article(articles, article_id) { + try { + for (var i = 0; i < articles.length; i++) { + if (articles[i].id == article_id) + return articles[i]; + } + + return false; + + } catch (e) { + exception_error("find_article", e); + } +} + function find_feed(feeds, feed_id) { try { for (var i = 0; i < feeds.length; i++) { @@ -120,10 +203,15 @@ function add_headline_entry(article, feed) { var tmp_html = "
  • " + icon_part + + "" + "" + article.title + "" + - "
    " + article.excerpt + "
    " + + "
    " + + "
    " + + article.excerpt + "
    " + + "" + "
    " + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + "
    • "; @@ -135,7 +223,7 @@ function add_headline_entry(article, feed) { } } -function digest_update(transport) { +function digest_update(transport, feed_id) { try { var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; @@ -157,17 +245,32 @@ function digest_update(transport) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - $('headlines-content').innerHTML = ""; + if (_active_feed_id != feed_id) + $('headlines-content').innerHTML = ""; + + //Element.hide('headlines-content'); + + var pr = $('MORE-PROMPT'); - Element.hide('headlines-content'); + if (pr) { + pr.id = ''; + Element.hide(pr); + } for (var i = 0; i < headlines.length; i++) { - add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + var elem = $('A-' + headlines[i].id); + + if (elem && Element.visible(elem)) { + + + } else { + add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); + } } -// $('headlines-content').innerHTML += "
  • " + -// "
    " + -// __("More articles...") + "
    • "; + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; new Effect.Appear('headlines-content'); @@ -184,7 +287,7 @@ function digest_init() { new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { - digest_update(transport); + digest_update(transport, -4); window.setTimeout('viewfeed(-4)', 100); } }); -- cgit v1.2.3 From c524d7e6825b9127630963ebb641af75387a34a3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Sep 2010 15:47:15 +0400 Subject: more digest page improvements --- digest.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 01f96a54e..8b1a8f0ce 100644 --- a/digest.js +++ b/digest.js @@ -212,7 +212,8 @@ function add_headline_entry(article, feed) { article.excerpt + "" + "" + - "
    " + feed.title + " " + " @ " + + "
    " + + feed.title + " " + " @ " + new Date(article.updated * 1000) + "
    " + "
    "; -- cgit v1.2.3 From 6361fd20fd89ba4bbda585066550b16a058eed43 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 10 Sep 2010 17:45:59 +0400 Subject: rudimentary support for starring/publishing articles in digest --- digest.js | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 8b1a8f0ce..2a886a89b 100644 --- a/digest.js +++ b/digest.js @@ -203,7 +203,11 @@ function add_headline_entry(article, feed) { var tmp_html = "
  • " + icon_part + + "
    " + + "" + + "" + "" + + "
    " + "" + article.title + "" + @@ -296,3 +300,117 @@ function digest_init() { exception_error("digest_init", e); } } + +function tMark_afh_off(effect) { + try { + var elem = effect.effects[0].element; + + console.log("tMark_afh_off : " + elem.id); + + if (elem) { + elem.src = elem.src.replace("mark_set", "mark_unset"); + elem.alt = __("Star article"); + Element.show(elem); + } + + } catch (e) { + exception_error("tMark_afh_off", e); + } +} + +function tPub_afh_off(effect) { + try { + var elem = effect.effects[0].element; + + console.log("tPub_afh_off : " + elem.id); + + if (elem) { + elem.src = elem.src.replace("pub_set", "pub_unset"); + elem.alt = __("Publish article"); + Element.show(elem); + } + + } catch (e) { + exception_error("tPub_afh_off", e); + } +} + +function toggleMark(mark_img, id) { + + try { + + var query = "?op=rpc&id=" + id + "&subop=mark"; + + query = query + "&afid=" + _active_feed_id; + query = query + "&omode=c"; + + if (!mark_img) return; + + var vfeedu = $("FEEDU--1"); + var crow = $("RROW-" + id); + + if (mark_img.src.match("mark_unset")) { + mark_img.src = mark_img.src.replace("mark_unset", "mark_set"); + mark_img.alt = __("Unstar article"); + query = query + "&mark=1"; + } else { + mark_img.alt = __("Please wait..."); + query = query + "&mark=0"; + + mark_img.src = mark_img.src.replace("mark_set", "mark_unset"); + mark_img.alt = __("Star article"); + } + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + // + } }); + + } catch (e) { + exception_error("toggleMark", e); + } +} + +function togglePub(mark_img, id, note) { + + try { + + var query = "?op=rpc&id=" + id + "&subop=publ"; + + query = query + "&afid=" + _active_feed_id; + + if (note != undefined) { + query = query + "¬e=" + param_escape(note); + } else { + query = query + "¬e=undefined"; + } + + query = query + "&omode=c"; + + if (!mark_img) return; + + 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.alt = __("Please wait..."); + query = query + "&pub=0"; + + mark_img.src = mark_img.src.replace("pub_set", "pub_unset"); + mark_img.alt = __("Publish article"); + } + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + // + } }); + + } catch (e) { + exception_error("togglePub", e); + } +} + -- cgit v1.2.3 From 11a7a966066942a263e11ecd546dc7c101f00cc7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 11 Sep 2010 11:33:47 +0400 Subject: more digest page improvements --- digest.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 2a886a89b..0e567193f 100644 --- a/digest.js +++ b/digest.js @@ -4,6 +4,22 @@ var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +function mark_selected_feed(feed_id) { + try { + var feeds = $("feeds-content").getElementsByTagName("LI"); + + for (var i = 0; i < feeds.length; i++) { + if (feeds[i].id == "F-" + feed_id) + feeds[i].className = "selected"; + else + feeds[i].className = ""; + } + + } catch (e) { + exception_error("mark_selected_feed", e); + } +} + function zoom(article_id) { try { var elem = $('A-' + article_id); @@ -103,7 +119,8 @@ function viewfeed(feed_id, offset) { digest_update(transport, feed_id); _active_feed_id = feed_id; _active_feed_offset = offset; - } }); + mark_selected_feed(feed_id); + } }); } catch (e) { exception_error("view", e); @@ -169,7 +186,7 @@ function add_feed_entry(feed) { icon_part = ""; - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + "" + feed.title + "
    " + feed.unread + "
    " + @@ -199,7 +216,7 @@ function add_headline_entry(article, feed) { var icon_part = ""; if (article.has_icon) - icon_part = ""; + icon_part = ""; var tmp_html = "
  • " + icon_part + -- cgit v1.2.3 From d5d5632952914611c0ddf93959034aa1e7d87c21 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 11 Sep 2010 15:25:47 +0400 Subject: code cleanup --- digest.js | 188 ++++++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 128 insertions(+), 60 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 0e567193f..38e2224bb 100644 --- a/digest.js +++ b/digest.js @@ -4,7 +4,23 @@ var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; -function mark_selected_feed(feed_id) { +function catchup_article(article_id, callback) { + try { + var query = "?op=rpc&subop=catchupSelected" + + "&cmode=0&ids=" + article_id; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + } }); + + } catch (e) { + exception_error("catchup_article", e); + } +} + +function set_selected_feed(feed_id) { try { var feeds = $("feeds-content").getElementsByTagName("LI"); @@ -15,6 +31,8 @@ function mark_selected_feed(feed_id) { feeds[i].className = ""; } + _active_feed_id = feed_id; + } catch (e) { exception_error("mark_selected_feed", e); } @@ -36,14 +54,8 @@ function zoom(article_id) { } } - var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; - - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - window.clearTimeout(_update_timeout); - _update_timeout = window.setTimeout('update()', 1000); - } }); + catchup_article(article_id, + function() { update(); }); } catch (e) { exception_error("zoom", e); @@ -52,13 +64,6 @@ function zoom(article_id) { function load_more() { try { - var elem = $('MORE-PROMPT'); - - if (elem) { - elem.id = ''; - Element.hide(elem); - } - viewfeed(_active_feed_id, _active_feed_offset + 10); } catch (e) { exception_error("load_more", e); @@ -67,30 +72,42 @@ function load_more() { function update() { try { - viewfeed(_active_feed_id, _active_feed_offset); + console.log('updating feeds...'); + + window.clearTimeout(_update_timeout); + + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=digest-init", + onComplete: function(transport) { + parse_feeds(transport); + set_selected_feed(_active_feed_id); + } }); + + _update_timeout = window.setTimeout('update()', 5*1000); } catch (e) { exception_error("update", e); } } -function view(article_id, dismiss_only) { +function remove_headline_entry(article_id) { try { var elem = $('A-' + article_id); - elem.id = ''; - - //new Effect.Fade(elem, {duration : 0.3}); + if (elem) { + elem.parentNode.removeChild(elem); + } - Element.hide(elem); + } catch (e) { + exception_error("remove_headline_entry", e); + } +} - var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id; +function view(article_id, dismiss_only) { + try { + remove_headline_entry(article_id); - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - window.clearTimeout(_update_timeout); - _update_timeout = window.setTimeout('update()', 1000); - } }); + catchup_article(article_id, + function() { update(); }); return dismiss_only != true; } catch (e) { @@ -103,23 +120,21 @@ function viewfeed(feed_id, offset) { if (!feed_id) feed_id = _active_feed_id; - if (!offset) + if (!offset) { offset = 0; - else + } else { offset = _active_feed_offset + offset; + } var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + "&offset=" + offset; - console.log(query); - new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - digest_update(transport, feed_id); - _active_feed_id = feed_id; + parse_headlines(transport, offset == 0); + set_selected_feed(feed_id); _active_feed_offset = offset; - mark_selected_feed(feed_id); } }); } catch (e) { @@ -175,6 +190,8 @@ function get_feed_icon(feed) { if (feed.id < -10) return 'images/label.png'; + return 'images/blank_icon.gif'; + } catch (e) { exception_error("get_feed_icon", e); } @@ -199,24 +216,12 @@ function add_feed_entry(feed) { } } -function add_latest_entry(article, feed) { - try { - - - //$("latest-content").innerHTML += "bbb"; - - } catch (e) { - exception_error("add_latest_entry", e); - } -} - function add_headline_entry(article, feed) { try { var icon_part = ""; - if (article.has_icon) - icon_part = ""; + icon_part = ""; var tmp_html = "
  • " + icon_part + @@ -245,7 +250,66 @@ function add_headline_entry(article, feed) { } } -function digest_update(transport, feed_id) { +function parse_feeds(transport) { + try { + + var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; + + if (feeds) { + feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + + last_feeds = feeds; + + $('feeds-content').innerHTML = ""; + + for (var i = 0; i < feeds.length; i++) { + add_feed_entry(feeds[i]); + } + } + + } catch (e) { + exception_error("parse_feeds", e); + } +} + +function parse_headlines(transport, replace) { + try { + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + + if (headlines) { + headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + + if (replace) $('headlines-content').innerHTML = ''; + + var pr = $('MORE-PROMPT'); + + if (pr) pr.parentNode.removeChild(pr); + + for (var i = 0; i < headlines.length; i++) { + + if (!$('A-' + headlines[i].id)) { + add_headline_entry(headlines[i], + find_feed(last_feeds, headlines[i].feed_id)); + } + } + + if (pr) { + $('headlines-content').appendChild(pr); + } else { + $('headlines-content').innerHTML += "
  • " + + "
    " + + __("More articles...") + "
    • "; + } + + new Effect.Appear('headlines-content'); + } + + } catch (e) { + exception_error("parse_headlines", e); + } +} + +/*function digest_update(transport, feed_id, offset) { try { var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; @@ -267,11 +331,9 @@ function digest_update(transport, feed_id) { if (headlines) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - if (_active_feed_id != feed_id) + if (_active_feed_id != feed_id || !offset) $('headlines-content').innerHTML = ""; - //Element.hide('headlines-content'); - var pr = $('MORE-PROMPT'); if (pr) { @@ -283,7 +345,8 @@ function digest_update(transport, feed_id) { var elem = $('A-' + headlines[i].id); if (elem && Element.visible(elem)) { - + if (!headlines[i].unread) + remove_headline_entry(headlines[i].id); } else { add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); @@ -295,22 +358,30 @@ function digest_update(transport, feed_id) { __("More articles...") + ""; new Effect.Appear('headlines-content'); + } + if (feed_id != undefined) { + _active_feed_id = feed_id; } + if (offset != undefined) _active_feed_offset = offset; + + mark_selected_feed(_active_feed_id); + } catch (e) { exception_error("digest_update", e); } - } +} */ -function digest_init() { +function init() { try { new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { - digest_update(transport, -4); + parse_feeds(transport); window.setTimeout('viewfeed(-4)', 100); + _update_timeout = window.setTimeout('update()', 5*1000); } }); } catch (e) { @@ -363,9 +434,6 @@ function toggleMark(mark_img, id) { if (!mark_img) return; - var vfeedu = $("FEEDU--1"); - var crow = $("RROW-" + id); - if (mark_img.src.match("mark_unset")) { mark_img.src = mark_img.src.replace("mark_unset", "mark_set"); mark_img.alt = __("Unstar article"); -- cgit v1.2.3 From e0cebf2a81f8ce20656c210c97b6751f3166b554 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 10:15:40 +0400 Subject: sort feeds list by unread; support fatal error messages and login redirects --- digest.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 38e2224bb..fffdf16ea 100644 --- a/digest.js +++ b/digest.js @@ -79,6 +79,7 @@ function update() { new Ajax.Request("backend.php", { parameters: "?op=rpc&subop=digest-init", onComplete: function(transport) { + fatal_error_check(transport); parse_feeds(transport); set_selected_feed(_active_feed_id); } }); @@ -132,6 +133,7 @@ function viewfeed(feed_id, offset) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { + fatal_error_check(transport); parse_headlines(transport, offset == 0); set_selected_feed(feed_id); _active_feed_offset = offset; @@ -258,6 +260,19 @@ function parse_feeds(transport) { if (feeds) { feeds = eval("(" + feeds.firstChild.nodeValue + ")"); + feeds.sort( function (a,b) + { + if (b.unread != a.unread) + return (b.unread - a.unread) + else + if (a.title > b.title) + return 1; + else if (a.title < b.title) + return -1; + else + return 0; + }); + last_feeds = feeds; $('feeds-content').innerHTML = ""; @@ -499,3 +514,45 @@ function togglePub(mark_img, id, note) { } } +function fatal_error(code, msg) { + try { + + if (code == 6) { + window.location.href = "digest.php"; + } else if (code == 5) { + window.location.href = "update.php"; + } else { + + if (msg == "") msg = "Unknown error"; + + console.error("Fatal error: " + code + "\n" + + msg); + + } + + } catch (e) { + exception_error("fatalError", e); + } +} + +function fatal_error_check(transport) { + try { + if (transport.responseXML) { + var error = transport.responseXML.getElementsByTagName("error")[0]; + + if (error) { + var code = error.getAttribute("error-code"); + var msg = error.getAttribute("error-msg"); + if (code != 0) { + fatal_error(code, msg); + return false; + } + } + } + } catch (e) { + exception_error("fatal_error_check", e); + } + return true; +} + + -- cgit v1.2.3 From c1b5cd23e068d269a2736ac4759fbaa09243f4dd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 11:05:03 +0400 Subject: digest: support feed catchup --- digest.js | 194 ++++++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 120 insertions(+), 74 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index fffdf16ea..a3cbb4879 100644 --- a/digest.js +++ b/digest.js @@ -3,6 +3,36 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +var _feedlist_expanded = false; + +function catchup_feed(feed_id, callback) { + try { + + var fn = find_feed(last_feeds, feed_id).title; + + if (confirm(__("Mark all articles in %s as read?").replace("%s", fn))) { + + var is_cat = ""; + + if (feed_id == -4) is_cat = "true"; + + var query = "?op=rpc&subop=catchupFeed&feed_id=" + + feed_id + "&is_cat=" + is_cat; + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + if (callback) callback(transport); + + update(); + } }); + } + + } catch (e) { + exception_error("catchup_article", e); + } +} + function catchup_article(article_id, callback) { try { @@ -205,10 +235,14 @@ function add_feed_entry(feed) { icon_part = ""; - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + - "" + feed.title + - "
    " + feed.unread + "
    " + + "    " + feed.title + "" + + "
    " + + "" + + "" + feed.unread + "" + + "
    " + "
    • "; $("feeds-content").innerHTML += tmp_html; @@ -252,9 +286,48 @@ function add_headline_entry(article, feed) { } } +function expand_feeds() { + try { + _feedlist_expanded = true; + + redraw_feedlist(last_feeds); + + } catch (e) { + exception_error("expand_feeds", e); + } +} + +function redraw_feedlist(feeds) { + try { + + $('feeds-content').innerHTML = ""; + + var limit = 10; + + if (_feedlist_expanded) limit = feeds.length; + + for (var i = 0; i < Math.min(limit, feeds.length); i++) { + add_feed_entry(feeds[i]); + } + + if (feeds.length > limit) { + $('feeds-content').innerHTML += "
  • " + + "" + + "" + + __("%d more...").replace("%d", feeds.length-10) + + "" + "
    • "; + } + + } catch (e) { + exception_error("redraw_feedlist", e); + } +} + function parse_feeds(transport) { try { + if (!transport.responseXML) return; + var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; if (feeds) { @@ -275,11 +348,7 @@ function parse_feeds(transport) { last_feeds = feeds; - $('feeds-content').innerHTML = ""; - - for (var i = 0; i < feeds.length; i++) { - add_feed_entry(feeds[i]); - } + redraw_feedlist(feeds); } } catch (e) { @@ -289,6 +358,8 @@ function parse_feeds(transport) { function parse_headlines(transport, replace) { try { + if (!transport.responseXML) return; + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; if (headlines) { @@ -296,7 +367,7 @@ function parse_headlines(transport, replace) { if (replace) $('headlines-content').innerHTML = ''; - var pr = $('MORE-PROMPT'); + var pr = $('H-MORE-PROMPT'); if (pr) pr.parentNode.removeChild(pr); @@ -311,7 +382,7 @@ function parse_headlines(transport, replace) { if (pr) { $('headlines-content').appendChild(pr); } else { - $('headlines-content').innerHTML += "
  • " + + $('headlines-content').innerHTML += "
  • " + "
    " + __("More articles...") + "
    • "; } @@ -324,70 +395,6 @@ function parse_headlines(transport, replace) { } } -/*function digest_update(transport, feed_id, offset) { - try { - var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; - var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; - - if (feeds) { - feeds = eval("(" + feeds.firstChild.nodeValue + ")"); - - last_feeds = feeds; - - $('feeds-content').innerHTML = ""; - - for (var i = 0; i < feeds.length; i++) { - add_feed_entry(feeds[i]); - } - } else { - feeds = last_feeds; - } - - if (headlines) { - headlines = eval("(" + headlines.firstChild.nodeValue + ")"); - - if (_active_feed_id != feed_id || !offset) - $('headlines-content').innerHTML = ""; - - var pr = $('MORE-PROMPT'); - - if (pr) { - pr.id = ''; - Element.hide(pr); - } - - for (var i = 0; i < headlines.length; i++) { - var elem = $('A-' + headlines[i].id); - - if (elem && Element.visible(elem)) { - if (!headlines[i].unread) - remove_headline_entry(headlines[i].id); - - } else { - add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id)); - } - } - - $('headlines-content').innerHTML += "
  • " + - "
    " + - __("More articles...") + "
    • "; - - new Effect.Appear('headlines-content'); - } - - if (feed_id != undefined) { - _active_feed_id = feed_id; - } - - if (offset != undefined) _active_feed_offset = offset; - - mark_selected_feed(_active_feed_id); - - } catch (e) { - exception_error("digest_update", e); - } -} */ - function init() { try { @@ -555,4 +562,43 @@ function fatal_error_check(transport) { return true; } +function feed_mi(elem) { + try { + var imgs = elem.getElementsByTagName('IMG'); + var spans = elem.getElementsByTagName('SPAN'); + + for (var i = 0; i < imgs.length; i++) { + if (imgs[i].className == "dismiss") + Element.show(imgs[i]); + } + + for (var i = 0; i < spans.length; i++) { + if (spans[i].className == "unread") + Element.hide(spans[i]); + } + + + } catch (e) { + exception_error("feed_mi", e); + } +} + +function feed_mo(elem) { + try { + var imgs = elem.getElementsByTagName('IMG'); + var spans = elem.getElementsByTagName('SPAN'); + + for (var i = 0; i < imgs.length; i++) { + if (imgs[i].className == "dismiss") + Element.hide(imgs[i]); + } + + for (var i = 0; i < spans.length; i++) { + if (spans[i].className == "unread") + Element.show(spans[i]); + } + } catch (e) { + exception_error("feed_mo", e); + } +} -- cgit v1.2.3 From 4311cc7e177a4c066d87f39d8b654420617172c1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 12:16:50 +0400 Subject: digest: show number of unread articles in the title --- digest.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'digest.js') diff --git a/digest.js b/digest.js index a3cbb4879..777473c61 100644 --- a/digest.js +++ b/digest.js @@ -346,6 +346,10 @@ function parse_feeds(transport) { return 0; }); + var all_articles = find_feed(feeds, -4); + + update_title(all_articles.unread); + last_feeds = feeds; redraw_feedlist(feeds); @@ -602,3 +606,16 @@ function feed_mo(elem) { exception_error("feed_mo", e); } } + +function update_title(unread) { + try { + document.title = "Tiny Tiny RSS"; + + if (unread > 0) + document.title += " (" + unread + ")"; + + } catch (e) { + exception_error("update_title", e); + } +} + -- cgit v1.2.3 From 1a434472bae1d6093abc816a253b53c600fd08c6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 12:20:19 +0400 Subject: load more headlines on view() --- digest.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 777473c61..7a1e7d2ec 100644 --- a/digest.js +++ b/digest.js @@ -138,7 +138,10 @@ function view(article_id, dismiss_only) { remove_headline_entry(article_id); catchup_article(article_id, - function() { update(); }); + function() { + viewfeed(_active_feed_id, _active_feed_offset); + update(); + }); return dismiss_only != true; } catch (e) { -- cgit v1.2.3 From 46360a961b5aded1cedc651b45636506c303e30b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 13:08:13 +0400 Subject: digest tweaks --- digest.js | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 7a1e7d2ec..ce9c325b5 100644 --- a/digest.js +++ b/digest.js @@ -33,6 +33,32 @@ 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); + + viewfeed(_active_feed_id, 0); + } }); + + } catch (e) { + exception_error("catchup_visible_articles", e); + } +} function catchup_article(article_id, callback) { try { @@ -243,7 +269,9 @@ function add_feed_entry(feed) { icon_part + "" + feed.title + "" + "
    " + - "" + + "" + "" + feed.unread + "" + "
    " + ""; @@ -267,7 +295,7 @@ function add_headline_entry(article, feed) { "
    " + "" + "" + - "" + + "" + "
    " + "" + @@ -390,8 +418,12 @@ function parse_headlines(transport, replace) { $('headlines-content').appendChild(pr); } else { $('headlines-content').innerHTML += "
  • " + - "
    " + - __("More articles...") + "
    • "; + "
    " + + "" + + __("Mark as read") + " | " + + "" + + __("Load more...") + "" + + "
    "; } new Effect.Appear('headlines-content'); -- cgit v1.2.3 From 9ed133e7a97e4ad591df2557646519a2f451adf3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 13:38:57 +0400 Subject: api: support published status in getHeadlines; digest: code cleanup --- digest.js | 70 +++++++++++++++++++++++---------------------------------------- 1 file changed, 25 insertions(+), 45 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index ce9c325b5..ba066a15f 100644 --- a/digest.js +++ b/digest.js @@ -14,7 +14,7 @@ function catchup_feed(feed_id, callback) { var is_cat = ""; - if (feed_id == -4) is_cat = "true"; + if (feed_id < 0) is_cat = "true"; // KLUDGE var query = "?op=rpc&subop=catchupFeed&feed_id=" + feed_id + "&is_cat=" + is_cat; @@ -290,18 +290,32 @@ function add_headline_entry(article, feed) { icon_part = ""; + var mark_part = ""; + var publ_part = ""; + + if (article.marked) + mark_part = ""; + else + mark_part = ""; + + if (article.published) + publ_part = ""; + else + publ_part = ""; + + var tmp_html = "
  • " + icon_part + "
    " + - "" + - "" + - "" + + mark_part + + publ_part + + "" + "
    " + "" + article.title + "" + "
    " + - "
    " + + "
    " + article.excerpt + "
    " + "" + @@ -450,41 +464,7 @@ function init() { } } -function tMark_afh_off(effect) { - try { - var elem = effect.effects[0].element; - - console.log("tMark_afh_off : " + elem.id); - - if (elem) { - elem.src = elem.src.replace("mark_set", "mark_unset"); - elem.alt = __("Star article"); - Element.show(elem); - } - - } catch (e) { - exception_error("tMark_afh_off", e); - } -} - -function tPub_afh_off(effect) { - try { - var elem = effect.effects[0].element; - - console.log("tPub_afh_off : " + elem.id); - - if (elem) { - elem.src = elem.src.replace("pub_set", "pub_unset"); - elem.alt = __("Publish article"); - Element.show(elem); - } - - } catch (e) { - exception_error("tPub_afh_off", e); - } -} - -function toggleMark(mark_img, id) { +function toggle_mark(mark_img, id) { try { @@ -510,15 +490,15 @@ function toggleMark(mark_img, id) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - // + update(); } }); } catch (e) { - exception_error("toggleMark", e); + exception_error("toggle_mark", e); } } -function togglePub(mark_img, id, note) { +function toggle_pub(mark_img, id, note) { try { @@ -552,11 +532,11 @@ function togglePub(mark_img, id, note) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - // + update(); } }); } catch (e) { - exception_error("togglePub", e); + exception_error("toggle_pub", e); } } -- cgit v1.2.3 From ef1ef3bc29b3324830c26efa9678568c4c530e2f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 14:05:12 +0400 Subject: digest: do not catchup on zoom --- digest.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index ba066a15f..82abe6676 100644 --- a/digest.js +++ b/digest.js @@ -110,8 +110,8 @@ function zoom(article_id) { } } - catchup_article(article_id, - function() { update(); }); + //catchup_article(article_id, + // function() { update(); }); } catch (e) { exception_error("zoom", e); -- cgit v1.2.3 From 78ac6caf001402142951ec90e8d0a1dac02e433b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 14:37:47 +0400 Subject: digest: support tags --- digest.js | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 82abe6676..51c824ee4 100644 --- a/digest.js +++ b/digest.js @@ -186,8 +186,10 @@ function viewfeed(feed_id, offset) { offset = _active_feed_offset + offset; } - var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + - "&offset=" + offset; + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + + param_escape(feed_id) + "&offset=" + offset; + + console.log(query); new Ajax.Request("backend.php", { parameters: query, @@ -293,6 +295,22 @@ function add_headline_entry(article, feed) { var mark_part = ""; var publ_part = ""; + var tags_part = ""; + + if (article.tags.length > 0) { + + tags_part = " " + __("in") + " "; + + for (var i = 0; i < Math.min(5, article.tags.length); i++) { + tags_part += "" + + article.tags[i] + ", "; + } + + tags_part = tags_part.replace(/, $/, ""); + tags_part = "" + tags_part + ""; + } + if (article.marked) mark_part = ""; else @@ -320,7 +338,7 @@ function add_headline_entry(article, feed) { "" + "
    " + - feed.title + " " + " @ " + + feed.title + " " + tags_part + " @ " + new Date(article.updated * 1000) + "
    " + "
    • "; @@ -410,10 +428,15 @@ function parse_headlines(transport, replace) { if (!transport.responseXML) return; var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0]; - if (headlines) { + if (headlines && headlines_title) { headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + var title = headlines_title.firstChild.nodeValue; + + $("headlines-title").innerHTML = title; + if (replace) $('headlines-content').innerHTML = ''; var pr = $('H-MORE-PROMPT'); -- cgit v1.2.3 From 6eed9e8071c5a4cff23ab956d616c0ab85313303 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 14:50:45 +0400 Subject: add some scriptaculous stuff --- digest.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 51c824ee4..886fbce89 100644 --- a/digest.js +++ b/digest.js @@ -437,22 +437,30 @@ function parse_headlines(transport, replace) { $("headlines-title").innerHTML = title; - if (replace) $('headlines-content').innerHTML = ''; + if (replace) { + $('headlines-content').innerHTML = ''; + Element.hide('headlines-content'); + } var pr = $('H-MORE-PROMPT'); if (pr) pr.parentNode.removeChild(pr); + var inserted = false; + for (var i = 0; i < headlines.length; i++) { if (!$('A-' + headlines[i].id)) { add_headline_entry(headlines[i], find_feed(last_feeds, headlines[i].feed_id)); + + inserted = $("A-" + headlines[i].id); } } if (pr) { $('headlines-content').appendChild(pr); + new Effect.ScrollTo(inserted); } else { $('headlines-content').innerHTML += "
  • " + "
    " + @@ -463,7 +471,9 @@ function parse_headlines(transport, replace) { "
    • "; } - new Effect.Appear('headlines-content'); + if (replace) new Effect.Appear('headlines-content', {duration : 0.3}); + + //new Effect.Appear('headlines-content'); } } catch (e) { -- cgit v1.2.3 From 41de9581216a904bd6a99cba5186e6b33bca06c9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 19:36:59 +0400 Subject: digest: article display tweaks --- digest.js | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 886fbce89..4faee1f6c 100644 --- a/digest.js +++ b/digest.js @@ -5,6 +5,14 @@ var _active_feed_offset = false; var _update_timeout = false; var _feedlist_expanded = false; +function article_appear(article_id) { + try { + new Effect.Appear('A-' + article_id); + } catch (e) { + exception_error("article_appear", e); + } +} + function catchup_feed(feed_id, callback) { try { @@ -165,8 +173,8 @@ function view(article_id, dismiss_only) { catchup_article(article_id, function() { - viewfeed(_active_feed_id, _active_feed_offset); - update(); + viewfeed(_active_feed_id, _active_feed_offset, false, true); + update(); }); return dismiss_only != true; @@ -175,7 +183,7 @@ function view(article_id, dismiss_only) { } } -function viewfeed(feed_id, offset) { +function viewfeed(feed_id, offset, replace, no_effects) { try { if (!feed_id) feed_id = _active_feed_id; @@ -186,6 +194,8 @@ function viewfeed(feed_id, offset) { offset = _active_feed_offset + offset; } + if (replace == undefined) replace = (offset == 0); + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + param_escape(feed_id) + "&offset=" + offset; @@ -195,7 +205,7 @@ function viewfeed(feed_id, offset) { parameters: query, onComplete: function(transport) { fatal_error_check(transport); - parse_headlines(transport, offset == 0); + parse_headlines(transport, replace, no_effects); set_selected_feed(feed_id); _active_feed_offset = offset; } }); @@ -285,7 +295,7 @@ function add_feed_entry(feed) { } } -function add_headline_entry(article, feed) { +function add_headline_entry(article, feed, no_effects) { try { var icon_part = ""; @@ -321,8 +331,11 @@ function add_headline_entry(article, feed) { else publ_part = ""; + var style = ""; - var tmp_html = "
  • " + + if (!no_effects) style = "style=\"display : none\""; + + var tmp_html = "
  • " + icon_part + "
    " + mark_part + @@ -344,6 +357,9 @@ function add_headline_entry(article, feed) { $("headlines-content").innerHTML += tmp_html; + if (!no_effects) + window.setTimeout('article_appear(' + article.id + ')', 100); + } catch (e) { exception_error("add_headline_entry", e); } @@ -423,7 +439,7 @@ function parse_feeds(transport) { } } -function parse_headlines(transport, replace) { +function parse_headlines(transport, replace, no_effects) { try { if (!transport.responseXML) return; @@ -452,7 +468,7 @@ function parse_headlines(transport, replace) { if (!$('A-' + headlines[i].id)) { add_headline_entry(headlines[i], - find_feed(last_feeds, headlines[i].feed_id)); + find_feed(last_feeds, headlines[i].feed_id), !no_effects); inserted = $("A-" + headlines[i].id); } @@ -460,7 +476,7 @@ function parse_headlines(transport, replace) { if (pr) { $('headlines-content').appendChild(pr); - new Effect.ScrollTo(inserted); + if (!no_effects) new Effect.ScrollTo(inserted); } else { $('headlines-content').innerHTML += "
  • " + "
    " + @@ -471,7 +487,8 @@ function parse_headlines(transport, replace) { "
    • "; } - if (replace) new Effect.Appear('headlines-content', {duration : 0.3}); + if (replace && !no_effects) + new Effect.Appear('headlines-content', {duration : 0.3}); //new Effect.Appear('headlines-content'); } -- cgit v1.2.3 From d8ea9902b6d9a8fce00bd826c9b654397a97bd0f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 19:52:15 +0400 Subject: digest: ajax loading for zoom() --- digest.js | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 4faee1f6c..4183d70c5 100644 --- a/digest.js +++ b/digest.js @@ -102,24 +102,28 @@ function set_selected_feed(feed_id) { } } -function zoom(article_id) { +function zoom(elem, article_id) { try { - var elem = $('A-' + article_id); + //alert(elem + "/" + article_id); - if (elem) { - var divs = elem.getElementsByTagName('DIV'); - - for (var i = 0; i < divs.length; i++) { - if (divs[i].className == 'excerpt') - Element.hide(divs[i]); + elem.innerHTML = " " + + __("Loading, please wait..."); - if (divs[i].className == 'content') - Element.show(divs[i]); - } - } + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=digest-get-contents&article_id=" + + article_id, + onComplete: function(transport) { + fatal_error_check(transport); + + if (transport.responseXML) { + var article = transport.responseXML.getElementsByTagName('article')[0]; + elem.innerHTML = article.firstChild.nodeValue; + } else { + elem.innerHTML = __("Error: unable to load article."); + } + + } }); - //catchup_article(article_id, - // function() { update(); }); } catch (e) { exception_error("zoom", e); @@ -346,10 +350,8 @@ function add_headline_entry(article, feed, no_effects) { "onclick=\"return view("+article.id+")\" class='title'>" + article.title + "" + "
    " + - "
    " + + "
    " + article.excerpt + "
    " + - "" + "
    " + feed.title + " " + tags_part + " @ " + new Date(article.updated * 1000) + "
    " + -- cgit v1.2.3 From 85629f6cf5bdf93d0155d1f893ad1cbbe8f30202 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 20:13:20 +0400 Subject: digest: layout tweaks --- digest.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 4183d70c5..2bf7779c8 100644 --- a/digest.js +++ b/digest.js @@ -118,6 +118,11 @@ function zoom(elem, article_id) { if (transport.responseXML) { var article = transport.responseXML.getElementsByTagName('article')[0]; elem.innerHTML = article.firstChild.nodeValue; + + new Effect.BlindDown(elem, {duration : 0.5}); + + elem.onclick = false; + elem.style.cursor = "auto"; } else { elem.innerHTML = __("Error: unable to load article."); } @@ -341,10 +346,11 @@ function add_headline_entry(article, feed, no_effects) { var tmp_html = "
  • " + icon_part + + "
    " + - mark_part + - publ_part + - "" + + mark_part + + publ_part + + "" + "
    " + "" + -- cgit v1.2.3 From d3f1300032fd6b0faabddbe58655401582a0dd54 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 20:21:41 +0400 Subject: digest: show loading indicator in feedlist --- digest.js | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 2bf7779c8..7a034f80e 100644 --- a/digest.js +++ b/digest.js @@ -210,6 +210,11 @@ function viewfeed(feed_id, offset, replace, no_effects) { console.log(query); + var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; + + img.setAttribute("orig_src", img.src); + img.src = 'images/indicator_tiny.gif'; + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -217,6 +222,7 @@ function viewfeed(feed_id, offset, replace, no_effects) { parse_headlines(transport, replace, no_effects); set_selected_feed(feed_id); _active_feed_offset = offset; + img.src = img.getAttribute("orig_src"); } }); } catch (e) { -- cgit v1.2.3 From eb4f33ec0270d2d97ff75818c2654140cc285872 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 20:29:10 +0400 Subject: digest: more loading prompts --- digest.js | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 7a034f80e..5cf8d4ec9 100644 --- a/digest.js +++ b/digest.js @@ -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") + " | " + "" + __("Load more...") + "" + + "" + "
    • "; } -- cgit v1.2.3 From e4c530dcc3e06e0890ea12f9454f343655fdfff3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 12 Sep 2010 22:36:18 +0400 Subject: digest: add rate limit for headline requests when catching up; control OOE responses with seq numbers --- digest.js | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 5cf8d4ec9..cf816cf95 100644 --- a/digest.js +++ b/digest.js @@ -3,7 +3,9 @@ var last_feeds = []; var _active_feed_id = false; var _active_feed_offset = false; var _update_timeout = false; +var _view_update_timeout = false; var _feedlist_expanded = false; +var _update_seq = 1; function article_appear(article_id) { try { @@ -181,14 +183,23 @@ function remove_headline_entry(article_id) { } } +function view_update() { + try { + viewfeed(_active_feed_id, _active_feed_offset, false, true); + update(); + } catch (e) { + exception_error("view_update", e); + } +} + function view(article_id, dismiss_only) { try { remove_headline_entry(article_id); catchup_article(article_id, function() { - viewfeed(_active_feed_id, _active_feed_offset, false, true); - update(); + window.clearTimeout(_view_update_timeout); + _view_update_timeout = window.setTimeout("view_update()", 1000); }); return dismiss_only != true; @@ -210,8 +221,11 @@ function viewfeed(feed_id, offset, replace, no_effects) { if (replace == undefined) replace = (offset == 0); + _update_seq = _update_seq + 1; + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + - param_escape(feed_id) + "&offset=" + offset; + param_escape(feed_id) + "&offset=" + offset + + "&seq=" + _update_seq; console.log(query); @@ -222,6 +236,7 @@ function viewfeed(feed_id, offset, replace, no_effects) { if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG"); + new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { @@ -465,6 +480,18 @@ function parse_headlines(transport, replace, no_effects) { try { if (!transport.responseXML) return; + var seq = transport.responseXML.getElementsByTagName('seq')[0]; + + if (seq) { + seq = seq.firstChild.nodeValue; + if (seq != _update_seq) { + console.log("parse_headlines: wrong sequence received."); + return; + } + } else { + return; + } + var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0]; -- cgit v1.2.3 From 01ee171a9c622d22e45c11314ea37ed9897af040 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 08:31:37 +0400 Subject: disable H-LOADING-IMG --- digest.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index cf816cf95..8f0142ab6 100644 --- a/digest.js +++ b/digest.js @@ -234,9 +234,6 @@ 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) { @@ -245,7 +242,6 @@ 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) { -- cgit v1.2.3 From ed6c208dda7a1ff2825a34786d795419f1536dac Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 08:40:37 +0400 Subject: support zoom for blank excerpts --- digest.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 8f0142ab6..9828dc7c2 100644 --- a/digest.js +++ b/digest.js @@ -369,6 +369,9 @@ function add_headline_entry(article, feed, no_effects) { if (!no_effects) style = "style=\"display : none\""; + if (article.excerpt.trim() == "") + article.excerpt = __("Click to expand article."); + var tmp_html = "
  • " + icon_part + -- cgit v1.2.3 From 2f57dff5e4ba3060c560a77b7634c663d4e19d01 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 08:56:50 +0400 Subject: digest: mark read article on zoom --- digest.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 9828dc7c2..a529db7fd 100644 --- a/digest.js +++ b/digest.js @@ -130,6 +130,15 @@ function zoom(elem, article_id) { elem.onclick = false; elem.style.cursor = "auto"; + + catchup_article(article_id, + function() { + window.clearTimeout(_view_update_timeout); + _view_update_timeout = window.setTimeout("view_update()", 500); + $("A-" + article_id).className = "read"; + }); + + } else { elem.innerHTML = __("Error: unable to load article."); } @@ -199,7 +208,7 @@ function view(article_id, dismiss_only) { catchup_article(article_id, function() { window.clearTimeout(_view_update_timeout); - _view_update_timeout = window.setTimeout("view_update()", 1000); + _view_update_timeout = window.setTimeout("view_update()", 500); }); return dismiss_only != true; @@ -372,7 +381,7 @@ function add_headline_entry(article, feed, no_effects) { if (article.excerpt.trim() == "") article.excerpt = __("Click to expand article."); - var tmp_html = "
  • " + + var tmp_html = "
  • " + icon_part + "
    " + -- cgit v1.2.3 From 5e9a79e13426ae29c4829d58ee3964cf8accee4a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 12:24:30 +0400 Subject: misc digest tweaks --- digest.js | 52 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 17 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index a529db7fd..ae7e870a2 100644 --- a/digest.js +++ b/digest.js @@ -46,17 +46,17 @@ function catchup_feed(feed_id, callback) { function catchup_visible_articles(callback) { try { - if (confirm(__("Mark all displayed articles as read?"))) { - - var elems = $("headlines-content").getElementsByTagName("LI"); - var ids = []; + 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-", "")); - } + for (var i = 0; i < elems.length; i++) { + if (elems[i].id && elems[i].id.match("A-")) { + ids.push(elems[i].id.replace("A-", "")); } - + } + + if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) { + var query = "?op=rpc&subop=catchupSelected" + "&cmode=0&ids=" + param_escape(ids); @@ -153,13 +153,22 @@ function zoom(elem, article_id) { function load_more() { try { - viewfeed(_active_feed_id, _active_feed_offset + 10); + var pr = $("H-LOADING-IMG"); + + if (pr) Element.show(pr); + + viewfeed(_active_feed_id, _active_feed_offset + 10, false, false, true, + function() { + var pr = $("H-LOADING-IMG"); + + if (pr) Element.hide(pr); + }); } catch (e) { exception_error("load_more", e); } } -function update() { +function update(callback) { try { console.log('updating feeds...'); @@ -171,6 +180,8 @@ function update() { fatal_error_check(transport); parse_feeds(transport); set_selected_feed(_active_feed_id); + + if (callback) callback(transport); } }); _update_timeout = window.setTimeout('update()', 5*1000); @@ -194,7 +205,7 @@ function remove_headline_entry(article_id) { function view_update() { try { - viewfeed(_active_feed_id, _active_feed_offset, false, true); + viewfeed(_active_feed_id, _active_feed_offset, false, true, true); update(); } catch (e) { exception_error("view_update", e); @@ -217,7 +228,7 @@ function view(article_id, dismiss_only) { } } -function viewfeed(feed_id, offset, replace, no_effects) { +function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) { try { if (!feed_id) feed_id = _active_feed_id; @@ -240,17 +251,24 @@ function viewfeed(feed_id, offset, replace, no_effects) { var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; - img.setAttribute("orig_src", img.src); - img.src = 'images/indicator_tiny.gif'; + if (img && !no_indicator) { + img.setAttribute("orig_src", img.src); + img.src = 'images/indicator_tiny.gif'; + } new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { fatal_error_check(transport); parse_headlines(transport, replace, no_effects); - set_selected_feed(feed_id); + set_selected_feed(feed_id); _active_feed_offset = offset; - img.src = img.getAttribute("orig_src"); + + if (img && !no_indicator) + img.src = img.getAttribute("orig_src"); + + if (callback) callback(transport); + } }); } catch (e) { -- cgit v1.2.3 From c7a5c8a5a2703f78bf36dc3f2c5cc2f8fc8ec713 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 14:39:16 +0400 Subject: add loading overlay --- digest.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'digest.js') diff --git a/digest.js b/digest.js index ae7e870a2..b788535fc 100644 --- a/digest.js +++ b/digest.js @@ -259,6 +259,8 @@ function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { + Element.hide("overlay"); + fatal_error_check(transport); parse_headlines(transport, replace, no_effects); set_selected_feed(feed_id); -- cgit v1.2.3 From c5325e0925a80dd02e45f2f5107f0a31c83f9027 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 15:02:50 +0400 Subject: digest: support exception error box --- digest.js | 1 - 1 file changed, 1 deletion(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index b788535fc..0b5a3f66a 100644 --- a/digest.js +++ b/digest.js @@ -579,7 +579,6 @@ function parse_headlines(transport, replace, no_effects) { function init() { try { - new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { -- cgit v1.2.3 From 5328c7d7f173722af5a9d476d9448667b360f67b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 15:08:34 +0400 Subject: digest: placeholder sanity check on init --- digest.js | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 0b5a3f66a..d6dc41e8a 100644 --- a/digest.js +++ b/digest.js @@ -577,7 +577,7 @@ function parse_headlines(transport, replace, no_effects) { } } -function init() { +function init_second_stage() { try { new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", @@ -587,6 +587,29 @@ function init() { _update_timeout = window.setTimeout('update()', 5*1000); } }); + } catch (e) { + exception_error("init_second_stage", e); + } +} + +function sanity_check(transport) { + try { + + + } catch (e) { + exception_error("sanity_check", e); + } +} + +function init() { + try { + + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=sanityCheck", + onComplete: function(transport) { + sanity_check(transport); + } }); + } catch (e) { exception_error("digest_init", e); } -- cgit v1.2.3 From 285de6d8a3221fc2dbc4954eb867b82d2e42d310 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 15:17:26 +0400 Subject: digest: utilize sanity checking on init --- digest.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index d6dc41e8a..8659c8fb3 100644 --- a/digest.js +++ b/digest.js @@ -1,4 +1,8 @@ var last_feeds = []; +var init_params = {}; + +var db = false; +var store = false; var _active_feed_id = false; var _active_feed_offset = false; @@ -309,7 +313,7 @@ function find_feed(feeds, feed_id) { function get_feed_icon(feed) { try { if (feed.has_icon) - return 'icons/' + feed.id + '.ico'; + return getInitParam('icons_location') + "/" + feed.id + '.ico'; if (feed.id == -1) return 'images/mark_set.png'; @@ -592,22 +596,13 @@ function init_second_stage() { } } -function sanity_check(transport) { - try { - - - } catch (e) { - exception_error("sanity_check", e); - } -} - function init() { try { new Ajax.Request("backend.php", { parameters: "?op=rpc&subop=sanityCheck", onComplete: function(transport) { - sanity_check(transport); + backend_sanity_check_callback(transport); } }); } catch (e) { -- cgit v1.2.3 From e638cd0201f1de0ec3c5fb42b63ca64f39ed67ed Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 13 Sep 2010 18:32:34 +0400 Subject: digest: properly mark fresh articles --- digest.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 8659c8fb3..cb42633b6 100644 --- a/digest.js +++ b/digest.js @@ -405,7 +405,15 @@ function add_headline_entry(article, feed, no_effects) { if (article.excerpt.trim() == "") article.excerpt = __("Click to expand article."); - var tmp_html = "
  • " + + var li_class = "unread"; + + var fresh_max = getInitParam("fresh_article_max_age") * 60 * 60; + var d = new Date(); + + if (d.getTime() / 1000 - article.updated < fresh_max) + li_class = "fresh"; + + var tmp_html = "
  • " + icon_part + "
    " + -- cgit v1.2.3 From b8a1b2ae945d4295971c72aad53fcf5841eb76c7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 22 Sep 2010 14:10:39 +0400 Subject: digest: only try to show feed loading indicator when feed is actually present on screen --- digest.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index cb42633b6..3fe85f68e 100644 --- a/digest.js +++ b/digest.js @@ -253,11 +253,13 @@ function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) console.log(query); - var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; + if ($("F-" + feed_id)) { + var img = $("F-" + feed_id).getElementsByTagName("IMG")[0]; - if (img && !no_indicator) { - img.setAttribute("orig_src", img.src); - img.src = 'images/indicator_tiny.gif'; + if (img && !no_indicator) { + img.setAttribute("orig_src", img.src); + img.src = 'images/indicator_tiny.gif'; + } } new Ajax.Request("backend.php", { -- cgit v1.2.3 From 58226f869cfc0f35bb22c4f5afc5c3d892dc3c54 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 22 Sep 2010 14:17:26 +0400 Subject: digest: do not show catchup/loadmore prompt when there's nothing to load --- digest.js | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) (limited to 'digest.js') diff --git a/digest.js b/digest.js index 3fe85f68e..98ae14d8c 100644 --- a/digest.js +++ b/digest.js @@ -47,9 +47,8 @@ function catchup_feed(feed_id, callback) { } } -function catchup_visible_articles(callback) { +function get_visible_article_ids() { try { - var elems = $("headlines-content").getElementsByTagName("LI"); var ids = []; @@ -59,6 +58,18 @@ function catchup_visible_articles(callback) { } } + return ids; + + } catch (e) { + exception_error("get_visible_article_ids", e); + } +} + +function catchup_visible_articles(callback) { + try { + + var ids = get_visible_article_ids(); + if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) { var query = "?op=rpc&subop=catchupSelected" + @@ -565,19 +576,25 @@ function parse_headlines(transport, replace, no_effects) { } } - if (pr) { - $('headlines-content').appendChild(pr); - if (!no_effects) new Effect.ScrollTo(inserted); - } else { - $('headlines-content').innerHTML += "
  • " + - "
    " + - "" + - __("Mark as read") + " | " + - "" + - __("Load more...") + "" + - " 0) { + if (pr) { + $('headlines-content').appendChild(pr); + if (!no_effects) new Effect.ScrollTo(inserted); + } else { + $('headlines-content').innerHTML += "
  • " + + "
    " + + "" + + __("Mark as read") + " | " + + "" + + __("Load more...") + "" + + "" + - "
    • "; + "
    "; + } + } else { + // FIXME : display some kind of "nothing to see here" prompt here } if (replace && !no_effects) -- cgit v1.2.3