diff options
-rwxr-xr-x | classes/feeds.php | 74 | ||||
-rw-r--r-- | js/Feeds.js | 2 | ||||
-rwxr-xr-x | js/Headlines.js | 135 |
3 files changed, 136 insertions, 75 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index aab770fc0..90add2297 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -234,8 +234,6 @@ class Feeds extends Handler_Protected { $headlines_count = 0; - $lnum = $offset; - $num_unread = 0; if ($_REQUEST["debug"]) $timing_info = print_checkpoint("PS", $timing_info); if (is_object($result)) { @@ -261,9 +259,8 @@ class Feeds extends Handler_Protected { $line['feed_id'] = 0; $line["feed_title"] = __("Archived articles"); } - $feed_id = $line["feed_id"]; - //$mouseover_attrs = "onmouseover='Article.mouseIn($id)' onmouseout='Article.mouseOut($id)'"; + $feed_id = $line["feed_id"]; $label_cache = $line["label_cache"]; $labels = false; @@ -292,18 +289,49 @@ class Feeds extends Handler_Protected { array_push($topmost_article_ids, $id); } - $class = ""; + if (!$line["feed_title"]) $line["feed_title"] = ""; - if ($line["unread"]) { - $class .= " Unread"; - ++$num_unread; - } + if (get_pref('COMBINED_DISPLAY_MODE')) { + + $line["buttons_left"] = ""; + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) { + $line["buttons_left"] .= $p->hook_article_left_button($line); + } + + $line["buttons"] = ""; + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) { + $line["buttons"] .= $p->hook_article_button($line); + } + + $line["content"] = sanitize($line["content"], + $line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]); + + foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) { + $line = $p->hook_render_article_cdm($line); + } + + $line['content'] = rewrite_cached_urls($line['content']); + $line["content"] = htmlspecialchars($line["content"]); + + if ($line['note']) + $line['note'] = Article::format_article_note($id, $line['note']); + else + $line['note'] = ""; + + if (!get_pref("CDM_EXPANDED")) { + $line["cdm_excerpt"] = "<span class='collapse'> + <i class='material-icons' onclick='return Article.cdmUnsetActive(event)' + title=\"" . __("Collapse article") . "\">remove_circle</i></span>"; - $class .= $line["marked"] ? " marked" : ""; - //$marked_pic = "<i class=\"marked-pic marked-$id material-icons\" onclick='Headlines.toggleMark($id)'>star</i>"; + if (get_pref('SHOW_CONTENT_PREVIEW')) { + $line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>"; + } + } + + $line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"], + $line["content"], $line["hide_images"]); + } - //$class .= $line["published"] ? " published" : ""; - //$published_pic = "<i class=\"pub-pic pub-$id material-icons\" onclick='Headlines.togglePub($id)'>rss_feed</i>"; $line["updated"] = make_local_datetime($line["updated"], false, false, false, true); $line['imported'] = T_sprintf("Imported at %s", @@ -314,11 +342,12 @@ class Feeds extends Handler_Protected { $line["score_pic"] = get_score_pic($score); $line["score_class"] = get_score_class($score); - //$entry_author = $line["author"]; + if ($line["tag_cache"]) + $tags = explode(",", $line["tag_cache"]); + else + $tags = false; - /* if ($entry_author) { - $entry_author = " — $entry_author"; - } */ + $line["tags_str"] = Article::format_tags_string($tags, $id); if (feeds::feedHasIcon($feed_id)) { $line['feed_icon'] = "<img class=\"icon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">"; @@ -326,16 +355,14 @@ class Feeds extends Handler_Protected { $line['feed_icon'] = "<i class='icon-no-feed material-icons'>rss_feed</i>"; } - //$entry_site_url = $line["site_url"]; - - //setting feed headline background color, needs to change text color based on dark/light + //setting feed headline background color, needs to change text color based on dark/light $fav_color = $line['favicon_avg_color']; require_once "colors.php"; if ($fav_color && $fav_color != 'fail') { if (!isset($rgba_cache[$feed_id])) { - $rgba_cache[$feed_id] = join(",", _color_unpack($fav_color)); + $rgba_cache[$feed_id] = join(",", _color_unpack($fav_color)) . ", 0.3"; } $line['favicon_avg_color_rgba'] = $rgba_cache[$feed_id]; @@ -419,7 +446,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "</div>"; $reply['content'] .= "</div>"; - } else { // HL + } else { // CDM if ($line["tag_cache"]) $tags = explode(",", $line["tag_cache"]); @@ -636,7 +663,6 @@ class Feeds extends Handler_Protected { $reply['content'] .= $tmp_content; } // end html */ - ++$lnum; } } @@ -644,7 +670,7 @@ class Feeds extends Handler_Protected { if (!$headlines_count) { - if (!is_numeric($result)) { + if (is_object($result)) { switch ($view_mode) { case "unread": diff --git a/js/Feeds.js b/js/Feeds.js index 5f7765119..3d6bc713e 100644 --- a/js/Feeds.js +++ b/js/Feeds.js @@ -363,7 +363,7 @@ define(["dojo/_base/declare"], function (declare) { if (viewfeed_debug) { window.open("backend.php?" + dojo.objectToQuery( - Object.assign({debug: 1, csrf_token: App.getInitParam("csrf_token")}, query) + Object.assign({debug: 0, csrf_token: App.getInitParam("csrf_token")}, query) )); } diff --git a/js/Headlines.js b/js/Headlines.js index 31e72fa3d..5e0e7de81 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -242,64 +242,88 @@ define(["dojo/_base/declare"], function (declare) { renderHeadline: function (headlines, hl) { let row = null; + let row_class = ""; + + if (hl.marked) row_class += " marked"; + if (hl.published) row_class += " published"; + if (App.isCombinedMode()) { - row = `<div class="cdm expanded ${hl.score_class}" id="RROW-${hl.id}" data-article-id="${hl.id}" data-orig-feed-id="${hl.feed_id}" - onmouseover="Article.mouseIn(${hl.id})" onmouseout="Article.mouseOut(${hl.id})"> - <div class="header"> - <div class="left"> - <input dojoType="dijit.form.CheckBox" type="checkbox" onclick="Headlines.onRowChecked(this)" class='rchk'> - <i class="marked-pic marked-8797658 material-icons" onclick="Headlines.toggleMark(8797658)">star</i> - <i class="pub-pic pub-8797658 material-icons" onclick="Headlines.togglePub(8797658)">rss_feed</i> - </div> - - <span onclick="return Headlines.click(event, ${hl.id});" data-article-id="${hl.id}" class="titleWrap hlMenuAttach"> - <a class="title" title="${hl.title}" target="_blank" rel="noopener noreferrer" href="${hl.link}"> - ${hl.title}</a> - <span class="author"> — ${hl.author}</span> - <span class="HLLCTR-${hl.id}"></span> - </span> - - <div class="feed"> - <a href="#" style="background-color: rgba(${hl.favicon_avg_color_rgba} ,0.3)" - onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> - </div> - - <span class="updated" title="${hl.imported}">${hl.updated}</span> - - <div class="right"> - - <i class="material-icons icon-score" title="${hl.score}" data-score="${hl.score}" onclick="Article.setScore(${hl.id}, this)">${hl.score_icon}</i> - - <span style="cursor : pointer" title="Tiny Tiny RSS '"" onclick="Feeds.open({feed:3205})"><img class="icon" src="feed-icons/3205.ico" alt=""></span></div></div><div class="content" onclick="return Headlines.click(event, 8797658, true);"><div id="POSTNOTE-8797658"></div><div class="content-inner" lang="en"><p>Sorry for hijacking this htread, but I have a similar issue.</p> -<p>I have a feed category with about 120 unread articles. I toggle headline grouping, but I am not sure if this matters or not.</p> -<p>I click on the category on the left pane, and start clicking “ctrl+down” to scroll to read the articles.<br> -At some point ( I tried to figure it out, but can say exactly after how many articles I read) the page won’t scroll down with “ctrl+down”, so I have to scroll with down key alone.</p> -<p>TT-rss says it’s refreshing the content (or something similar), but was it does, is marking as read a bunch of articles, that were supposed to be shown between the last one I actually read, and the first unread it shows, which should not really be the first unread.</p> -<p>Last time it happened, I had around 120 unread articles, I could scroll via ctrl+down untill 80 were unread, I scroled manually, and it jumped to 50 unread. The right pane is also refreshed, so I can not scroll up to go through the ones marked as unread.</p> -<p>I hope it is somewhat related to this thread, otherwise let me know and I can open a new one.</p> -<p>Please let me know if what I wrote is clear.</p> -<p>By the way I am running f6e287df110b2046643551aaae70917c61b061c9 on shared hosting, PHP 7 and Mysql.</p></div><div class="intermediate"></div><div class="footer" onclick="event.stopPropagation()"><div class="left"><i class="material-icons">label_outline</i> - <span id="ATSTR-8797658">no tags</span> - <a title="Edit tags for this article" href="#" onclick="Article.editTags(8797658)">(+)</a></div><div class="right"><i style="cursor : pointer" class="material-icons" onclick="Plugins.Psql_Trgm.showRelated(8797658)" title="Show related articles">bookmark_outline</i><i class="material-icons" style="cursor : pointer" onclick="Plugins.Mail.send(8797658)" title="Forward by email">mail</i><i class="material-icons" onclick="Plugins.Note.edit(8797658)" style="cursor : pointer" title="Edit article note">note</i><i id="SHARE-IMG-6023086" class="material-icons icon-share " style="cursor : pointer" onclick="Plugins.Share.shareArticle(6023086)" title="Share by URL">link</i></div></div></div></div>`; + row_class += App.getInitParam("cdm_expanded") ? " expanded" : " expandable"; + + row = `<div class="cdm ${row_class} ${hl.score_class}" id="RROW-${hl.id}" data-article-id="${hl.id}" data-orig-feed-id="${hl.feed_id}" + data-content="${hl.content}" onmouseover="Article.mouseIn(${hl.id})" onmouseout="Article.mouseOut(${hl.id})"> + + <div class="header"> + <div class="left"> + <input dojoType="dijit.form.CheckBox" type="checkbox" onclick="Headlines.onRowChecked(this)" class='rchk'> + <i class="marked-pic marked-${hl.id} material-icons" onclick="Headlines.toggleMark(${hl.id})">star</i> + <i class="pub-pic pub-${hl.id} material-icons" onclick="Headlines.togglePub(${hl.id})">rss_feed</i> + </div> + + <span onclick="return Headlines.click(event, ${hl.id});" data-article-id="${hl.id}" class="titleWrap hlMenuAttach"> + <a class="title" title="${hl.title}" target="_blank" rel="noopener noreferrer" href="${hl.link}"> + ${hl.title}</a> + <span class="author">${hl.author}</span> + <span class="HLLCTR-${hl.id}">${hl.labels}</span> + ${hl.cdm_excerpt ? hl.cdm_excerpt : ""} + </span> + + <div class="feed"> + <a href="#" style="background-color: rgba(${hl.favicon_avg_color_rgba})" + onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> + </div> + + <span class="updated" title="${hl.imported}">${hl.updated}</span> + + <div class="right"> + <i class="material-icons icon-score" title="${hl.score}" data-score="${hl.score}" + onclick="Article.setScore(${hl.id}, this)">${hl.score_pic}</i> + + <span style="cursor : pointer" title="${hl.feed_title}" onclick="Feeds.open({feed:${hl.feed_id}})"> + ${hl.feed_icon}</span> + </div> + + </div> + + <div class="content" onclick="return Headlines.click(event, ${hl.id}, true);"> + <div id="POSTNOTE-${hl.id}">${hl.note}</div> + <div class="content-inner" lang="${hl.lang ? hl.lang : 'en'}"></div> + <div class="intermediate"> + ${hl.enclosures} + </div> + <div class="footer" onclick="event.stopPropagation()"> + + <div class="left"> + ${hl.buttons_left} + <i class="material-icons">label_outline</i> + <span id="ATSTR-${hl.id}">${hl.tags_str}</span> + <a title="Edit tags for this article" href="#" + onclick="Article.editTags(${hl.id})">(+)</a> + </div> + + <div class="right">${hl.buttons}</div> + </div> + </div> + </div>`; } else { - row = `<div class="hl ${hl.score_class}" data-orig-feed-id="${hl.feed_id}" data-article-id="${hl.id}" id="RROW-${hl.id}" + row = `<div class="hl ${row_class} ${hl.score_class}" data-orig-feed-id="${hl.feed_id}" data-article-id="${hl.id}" id="RROW-${hl.id}" onmouseover="Article.mouseIn(${hl.id})" onmouseout="Article.mouseOut(${hl.id})"> <div class="left"> <input dojoType="dijit.form.CheckBox" type="checkbox" onclick="Headlines.onRowChecked(this)" class='rchk'> - <i class="marked-pic marked-8804827 material-icons" onclick="Headlines.toggleMark(${hl.id})">star</i> + <i class="marked-pic marked-${hl.id} material-icons" onclick="Headlines.toggleMark(${hl.id})">star</i> <i class="pub-pic pub-${hl.id} material-icons" onclick="Headlines.togglePub(${hl.id})">rss_feed</i> </div> <div onclick="return Headlines.click(event, ${hl.id})" class="title"> <span data-article-id="${hl.id}" class="hl-content hlMenuAttach"> - <a class="title" href="${hl.link}">${hl.title} - <span class="preview">${hl.content_preview}</span> - </a> + <a class="title" href="${hl.link}">${hl.title} <span class="preview">${hl.content_preview}</span></a> + <!-- <span class="author">${hl.author}</span> --> + <span class="HLLCTR-${hl.id}">${hl.labels}</span> </span> </div> <span class="feed"> - <a style="background : rgba(${hl.favicon_avg_color_rgba}, 0.3)" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> + <a style="background : rgba(${hl.favicon_avg_color_rgba})" href="#" onclick="Feeds.open({feed:${hl.feed_id}})">${hl.feed_title}</a> </span> <div title="${hl.imported}"> <span class="updated">${hl.updated}</span> @@ -356,8 +380,7 @@ At some point ( I tried to figure it out, but can say exactly after how many art $("headlines-frame").addClassName(App.isCombinedMode() ? "cdm" : "normal"); const headlines_count = reply['headlines-info']['count']; - //Feeds.infscroll_disabled = parseInt(headlines_count) != 30; - Feeds.infscroll_disabled = true; // TEMPORARY + Feeds.infscroll_disabled = parseInt(headlines_count) != 30; console.log('received', headlines_count, 'headlines, infscroll disabled=', Feeds.infscroll_disabled); @@ -371,10 +394,14 @@ At some point ( I tried to figure it out, but can say exactly after how many art reply['headlines']['toolbar'], {parseContent: true}); - $("headlines-frame").innerHTML = ''; + if (typeof reply['headlines']['content'] == 'string') { + $("headlines-frame").innerHTML = reply['headlines']['content']; + } else { + $("headlines-frame").innerHTML = ''; - for (let i = 0; i < reply['headlines']['content'].length; i++) { - this.renderHeadline(reply['headlines'], reply['headlines']['content'][i]); + for (let i = 0; i < reply['headlines']['content'].length; i++) { + this.renderHeadline(reply['headlines'], reply['headlines']['content'][i]); + } } /* let tmp = document.createElement("div"); @@ -421,7 +448,7 @@ At some point ( I tried to figure it out, but can say exactly after how many art if (hsp) c.domNode.removeChild(hsp); - let tmp = document.createElement("div"); + /* let tmp = document.createElement("div"); tmp.innerHTML = reply['headlines']['content']; dojo.parser.parse(tmp); @@ -433,6 +460,14 @@ At some point ( I tried to figure it out, but can say exactly after how many art this.loaded_article_ids.push(row.id); } + } */ + + if (typeof reply['headlines']['content'] == 'string') { + $("headlines-frame").innerHTML = reply['headlines']['content']; + } else { + for (let i = 0; i < reply['headlines']['content'].length; i++) { + this.renderHeadline(reply['headlines'], reply['headlines']['content'][i]); + } } if (!hsp) { |