X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=digest.js;h=ee76c735bf3516a5b856a6680bb33b0ee4267f43;hb=8ad4bac0fd44220528896d8b5fedbb84220b1ea4;hp=82abe6676cb9434a8659ef90658d722162316773;hpb=ef1ef3bc29b3324830c26efa9678568c4c530e2f;p=tt-rss.git diff --git a/digest.js b/digest.js index 82abe667..ee76c735 100644 --- a/digest.js +++ b/digest.js @@ -1,9 +1,19 @@ var last_feeds = []; +var init_params = {}; 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 { + new Effect.Appear('A-' + article_id); + } catch (e) { + exception_error("article_appear", e); + } +} function catchup_feed(feed_id, callback) { try { @@ -16,14 +26,14 @@ function catchup_feed(feed_id, callback) { if (feed_id < 0) is_cat = "true"; // KLUDGE - var query = "?op=rpc&subop=catchupFeed&feed_id=" + + var query = "?op=rpc&subop=catchupFeed&feed_id=" + feed_id + "&is_cat=" + is_cat; new Ajax.Request("backend.php", { - parameters: query, + parameters: query, onComplete: function(transport) { if (callback) callback(transport); - + update(); } }); } @@ -33,27 +43,43 @@ 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 = []; - + for (var i = 0; i < elems.length; i++) { if (elems[i].id && elems[i].id.match("A-")) { - ids.push(elems[i].id.replace("A-", "")); + ids.push(elems[i].id.replace("A-", "")); } } - var query = "?op=rpc&subop=catchupSelected" + - "&cmode=0&ids=" + param_escape(ids); + return ids; - new Ajax.Request("backend.php", { - parameters: query, - onComplete: function(transport) { - if (callback) callback(transport); + } catch (e) { + exception_error("get_visible_article_ids", e); + } +} - viewfeed(_active_feed_id, 0); - } }); +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" + + "&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); @@ -66,7 +92,7 @@ function catchup_article(article_id, callback) { "&cmode=0&ids=" + article_id; new Ajax.Request("backend.php", { - parameters: query, + parameters: query, onComplete: function(transport) { if (callback) callback(transport); } }); @@ -76,6 +102,29 @@ function catchup_article(article_id, callback) { } } +function set_selected_article(article_id) { + try { + $$("#headlines-content > li[id*=A-]").each(function(article) { + var id = article.id.replace("A-", ""); + + var cb = article.getElementsByTagName("INPUT")[0]; + + if (id == article_id) { + article.addClassName("selected"); + cb.checked = true; + } else { + article.removeClassName("selected"); + cb.checked = false; + } + + }); + + } catch (e) { + exception_error("mark_selected_feed", e); + } +} + + function set_selected_feed(feed_id) { try { var feeds = $("feeds-content").getElementsByTagName("LI"); @@ -94,39 +143,26 @@ function set_selected_feed(feed_id) { } } -function zoom(article_id) { +function load_more() { try { - var elem = $('A-' + article_id); + var pr = $("H-LOADING-IMG"); - 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]); - } - } + if (pr) Element.show(pr); - //catchup_article(article_id, - // function() { update(); }); + var offset = $$("#headlines-content > li[id*=A-][class*=fresh],li[id*=A-][class*=unread]").length; - } catch (e) { - exception_error("zoom", e); - } -} + viewfeed(false, offset, false, false, true, + function() { + var pr = $("H-LOADING-IMG"); -function load_more() { - try { - viewfeed(_active_feed_id, _active_feed_offset + 10); + if (pr) Element.hide(pr); + }); } catch (e) { exception_error("load_more", e); } } -function update() { +function update(callback) { try { console.log('updating feeds...'); @@ -138,6 +174,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); @@ -159,43 +197,154 @@ function remove_headline_entry(article_id) { } } -function view(article_id, dismiss_only) { +function view_update() { + try { + viewfeed(_active_feed_id, _active_feed_offset, false, true, true); + update(); + } catch (e) { + exception_error("view_update", e); + } +} + +function view(article_id) { try { - remove_headline_entry(article_id); + $("content").addClassName("move"); - catchup_article(article_id, - function() { - viewfeed(_active_feed_id, _active_feed_offset); - update(); - }); + var a = $("A-" + article_id); + var h = $("headlines"); + + setTimeout(function() { + // below or above viewport, reposition headline + if (a.offsetTop > h.scrollTop + h.offsetHeight || a.offsetTop+a.offsetHeight < h.scrollTop+a.offsetHeight) + h.scrollTop = a.offsetTop - (h.offsetHeight/2 - a.offsetHeight/2); + }, 500); + + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=digest-get-contents&article_id=" + + article_id, + onComplete: function(transport) { + fatal_error_check(transport); + + var reply = JSON.parse(transport.responseText); - return dismiss_only != true; + if (reply) { + var article = reply['article']; + + 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 += article.tags[i] + ", "; + } + + tags_part = tags_part.replace(/, $/, ""); + tags_part = "" + tags_part + ""; + + } + + if (article.marked) + mark_part = ""; + else + mark_part = ""; + + if (article.published) + publ_part = ""; + else + publ_part = ""; + + var tmp = "
" + + "" + __("Original article") + "" + + "
" + + __("Close this panel") + "
" + + "
" + + "
" + + mark_part + + publ_part + + "
" + + "

" + article.title + "

" + + "
" + + tags_part + + "
" + + article.content + "
"; + + $("article-content").innerHTML = tmp; + $("article").addClassName("visible"); + + set_selected_article(article.id); + + catchup_article(article_id, + function() { + $("A-" + article_id).addClassName("read"); + }); + + } else { + elem.innerHTML = __("Error: unable to load article."); + } + } + }); + + + return false; } catch (e) { exception_error("view", e); } } -function viewfeed(feed_id, offset) { +function close_article() { + $("content").removeClassName("move"); + $("article").removeClassName("visible"); +} + +function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) { try { if (!feed_id) feed_id = _active_feed_id; + if (offset == undefined) offset = 0; + if (replace == undefined) replace = (offset == 0); - if (!offset) { - offset = 0; - } else { - offset = _active_feed_offset + offset; - } + _update_seq = _update_seq + 1; + + if (!offset) $("headlines").scrollTop = 0; + + var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + + param_escape(feed_id) + "&offset=" + offset + + "&seq=" + _update_seq; - var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id + - "&offset=" + offset; + console.log(query); + + 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'; + } + } new Ajax.Request("backend.php", { - parameters: query, + parameters: query, onComplete: function(transport) { + Element.hide("overlay"); + fatal_error_check(transport); - parse_headlines(transport, offset == 0); + parse_headlines(transport, replace, no_effects); set_selected_feed(feed_id); _active_feed_offset = offset; + + if (img && !no_indicator) + img.src = img.getAttribute("orig_src"); + + if (callback) callback(transport); + } }); } catch (e) { @@ -234,7 +383,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_url') + "/" + feed.id + '.ico'; if (feed.id == -1) return 'images/mark_set.png'; @@ -245,10 +394,10 @@ function get_feed_icon(feed) { if (feed.id == -3) return 'images/fresh.png'; - if (feed.id == -4) + if (feed.id == -4) return 'images/tag.png'; - if (feed.id < -10) + if (feed.id < -10) return 'images/label.png'; return 'images/blank_icon.gif'; @@ -264,68 +413,74 @@ function add_feed_entry(feed) { icon_part = ""; - var tmp_html = "
  • " + - icon_part + - "" + feed.title + "" + - "
    " + - "" + - "" + feed.unread + "" + - "
    " + - "
    • "; + var tmp_html = "
  • " + + icon_part + feed.title + + "
    " + "" + feed.unread + "" + + "
    " + "
    • "; $("feeds-content").innerHTML += tmp_html; + } catch (e) { exception_error("add_feed_entry", e); } } -function add_headline_entry(article, feed) { +function add_headline_entry(article, feed, no_effects) { try { var icon_part = ""; icon_part = ""; - var mark_part = ""; - var publ_part = ""; - if (article.marked) - mark_part = ""; - else - mark_part = ""; + var style = ""; - if (article.published) - publ_part = ""; - else - publ_part = ""; + //if (!no_effects) style = "style=\"display : none\""; + + if (article.excerpt.trim() == "") + article.excerpt = __("Click to expand article."); + + 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 = "
  • " + + //"" + + + var checkbox_part = ""; + + var date = new Date(article.updated * 1000); + + var date_part = date.toString().substring(0,21); + + var tmp_html = "
  • " + + checkbox_part + icon_part + - "
    " + - mark_part + - publ_part + - "" + - "
    " + "" + + "onclick=\"return view("+article.id+")\" class='title'>" + article.title + "" + - "
    " + - "
    " + + "
    " + + "
    " + article.excerpt + "
    " + - "" + - "
    " + - feed.title + " " + " @ " + - new Date(article.updated * 1000) + "
    " + + "
    "; + +/* tmp_html += "" + + feed.title + " " + " @ "; */ + + tmp_html += date_part + "
    " + "
    • "; $("headlines-content").innerHTML += tmp_html; + if (!no_effects) + window.setTimeout('article_appear(' + article.id + ')', 100); + } catch (e) { exception_error("add_headline_entry", e); } @@ -357,12 +512,21 @@ function redraw_feedlist(feeds) { if (feeds.length > limit) { $('feeds-content').innerHTML += "
  • " + - "" + + "" + "" + - __("%d more...").replace("%d", feeds.length-10) + + __("%d more...").replace("%d", feeds.length-10) + "" + "
    • "; } + if (feeds.length == 0) { + $('feeds-content').innerHTML = + "
    " + + __("No unread feeds.") + "
    "; + } + + if (_active_feed_id) + set_selected_feed(_active_feed_id); + } catch (e) { exception_error("redraw_feedlist", e); } @@ -370,25 +534,25 @@ function redraw_feedlist(feeds) { function parse_feeds(transport) { try { + var reply = JSON.parse(transport.responseText); - if (!transport.responseXML) return; + if (!reply) return; - var feeds = transport.responseXML.getElementsByTagName('feeds')[0]; + var feeds = reply['feeds']; if (feeds) { - feeds = eval("(" + feeds.firstChild.nodeValue + ")"); - feeds.sort( function (a,b) - { + feeds.sort( function (a,b) + { if (b.unread != a.unread) - return (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; + return 0; }); var all_articles = find_feed(feeds, -4); @@ -405,42 +569,73 @@ function parse_feeds(transport) { } } -function parse_headlines(transport, replace) { +function parse_headlines(transport, replace, no_effects) { try { - if (!transport.responseXML) return; + var reply = JSON.parse(transport.responseText); + if (!reply) return; - var headlines = transport.responseXML.getElementsByTagName('headlines')[0]; + var seq = reply['seq']; - if (headlines) { - headlines = eval("(" + headlines.firstChild.nodeValue + ")"); + if (seq) { + if (seq != _update_seq) { + console.log("parse_headlines: wrong sequence received."); + return; + } + } else { + return; + } + + var headlines = reply['headlines']['content']; + var headlines_title = reply['headlines']['title']; - if (replace) $('headlines-content').innerHTML = ''; + if (headlines && headlines_title) { + + if (replace) { + $('headlines-content').innerHTML = ''; + } 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)); + add_headline_entry(headlines[i], + find_feed(last_feeds, headlines[i].feed_id), !no_effects); + } } - if (pr) { - $('headlines-content').appendChild(pr); + console.log(inserted.id); + + var ids = get_visible_article_ids(); + + if (ids.length > 0) { + if (pr) { + $('headlines-content').appendChild(pr); + + } else { + $('headlines-content').innerHTML += "
  • " + + "
    " + + "" + + __("Mark as read") + " | " + + "" + + __("Load more...") + "" + + "" + + "
    • "; + } } else { - $('headlines-content').innerHTML += "
  • " + - "
    " + - "" + - __("Mark as read") + " | " + - "" + - __("Load more...") + "" + - "
    • "; + // FIXME : display some kind of "nothing to see here" prompt here } - new Effect.Appear('headlines-content'); +// if (replace && !no_effects) +// new Effect.Appear('headlines-content', {duration : 0.3}); + + //new Effect.Appear('headlines-content'); } } catch (e) { @@ -448,48 +643,59 @@ function parse_headlines(transport, replace) { } } -function init() { +function init_second_stage() { try { - new Ajax.Request("backend.php", { parameters: "backend.php?op=rpc&subop=digest-init", onComplete: function(transport) { parse_feeds(transport); + Element.hide("overlay"); + window.setTimeout('viewfeed(-4)', 100); _update_timeout = window.setTimeout('update()', 5*1000); } }); + } catch (e) { + exception_error("init_second_stage", e); + } +} + +function init() { + try { + dojo.require("dijit.Dialog"); + + new Ajax.Request("backend.php", { + parameters: "?op=rpc&subop=sanityCheck", + onComplete: function(transport) { + backend_sanity_check_callback(transport); + } }); + } catch (e) { exception_error("digest_init", e); } } -function toggle_mark(mark_img, id) { +function toggle_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; + if (!img) return; - if (mark_img.src.match("mark_unset")) { - mark_img.src = mark_img.src.replace("mark_unset", "mark_set"); - mark_img.alt = __("Unstar article"); + if (img.src.match("mark_unset")) { + img.src = img.src.replace("mark_unset", "mark_set"); + img.alt = __("Unstar article"); query = query + "&mark=1"; } else { - mark_img.alt = __("Please wait..."); + img.src = img.src.replace("mark_set", "mark_unset"); + img.alt = __("Star article"); 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) { + onComplete: function(transport) { update(); } }); @@ -498,13 +704,11 @@ function toggle_mark(mark_img, id) { } } -function toggle_pub(mark_img, id, note) { +function toggle_pub(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); @@ -512,26 +716,22 @@ function toggle_pub(mark_img, id, note) { query = query + "¬e=undefined"; } - query = query + "&omode=c"; + if (!img) return; - 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"); + if (img.src.match("pub_unset") || note != undefined) { + img.src = img.src.replace("pub_unset", "pub_set"); + img.alt = __("Unpublish article"); query = query + "&pub=1"; } else { - mark_img.alt = __("Please wait..."); + img.src = img.src.replace("pub_set", "pub_unset"); + img.alt = __("Publish article"); 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) { + onComplete: function(transport) { update(); } }); @@ -541,19 +741,19 @@ function toggle_pub(mark_img, id, note) { } function fatal_error(code, msg) { - try { + try { if (code == 6) { window.location.href = "digest.php"; } else if (code == 5) { - window.location.href = "update.php"; + window.location.href = "db-updater.php"; } else { - + if (msg == "") msg = "Unknown error"; - console.error("Fatal error: " + code + "\n" + + console.error("Fatal error: " + code + "\n" + msg); - + } } catch (e) { @@ -581,56 +781,59 @@ function fatal_error_check(transport) { return true; } -function feed_mi(elem) { +function update_title(unread) { 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]); - } + document.title = "Tiny Tiny RSS"; + if (unread > 0) + document.title += " (" + unread + ")"; } catch (e) { - exception_error("feed_mi", e); + exception_error("update_title", e); } } -function feed_mo(elem) { +function tweet_article(id) { 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]); - } + var query = "?op=rpc&subop=getTweetInfo&id=" + param_escape(id); - for (var i = 0; i < spans.length; i++) { - if (spans[i].className == "unread") - Element.show(spans[i]); - } + console.log(query); + + var d = new Date(); + var ts = d.getTime(); + + var w = window.open('backend.php?op=loading', 'ttrss_tweet', + "status=0,toolbar=0,location=0,width=500,height=400,scrollbars=1,menubar=0"); + + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + var ti = JSON.parse(transport.responseText); + + var share_url = "http://twitter.com/share?_=" + ts + + "&text=" + param_escape(ti.title) + + "&url=" + param_escape(ti.link); + + w.location.href = share_url; + + } }); } catch (e) { - exception_error("feed_mo", e); + exception_error("tweet_article", e); } } -function update_title(unread) { +function toggle_select_article(elem) { try { - document.title = "Tiny Tiny RSS"; + var article = elem.parentNode; - if (unread > 0) - document.title += " (" + unread + ")"; + if (article.hasClassName("selected")) + article.removeClassName("selected"); + else + article.addClassName("selected"); } catch (e) { - exception_error("update_title", e); + exception_error("toggle_select_article", e); } } -