diff options
-rw-r--r-- | js/Article.js | 33 | ||||
-rwxr-xr-x | js/Headlines.js | 26 | ||||
-rw-r--r-- | plugins/af_proxy_http/init.php | 2 |
3 files changed, 4 insertions, 57 deletions
diff --git a/js/Article.js b/js/Article.js index 76637cd69..e97a6c8e6 100644 --- a/js/Article.js +++ b/js/Article.js @@ -180,36 +180,6 @@ const Article = { ${__('Originally from:')} <a target="_blank" rel="noopener noreferrer" href="${App.escapeHtml(hl.orig_feed[1])}">${hl.orig_feed[0]}</a> </span>` : ""; }, - unpack: function(row) { - if (row.hasAttribute("data-content")) { - console.log("unpacking: " + row.id); - - const container = row.querySelector(".content-inner"); - - container.innerHTML = row.getAttribute("data-content").trim(); - - // blank content element might screw up onclick selection and keyboard moving - if (container.textContent.length == 0) - container.innerHTML += " "; - - // in expandable mode, save content for later, so that we can pack unfocused rows back - if (App.isCombinedMode() && $("main").hasClassName("expandable")) - row.setAttribute("data-content-original", row.getAttribute("data-content")); - - row.removeAttribute("data-content"); - - PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, row); - } - }, - pack: function(row) { - if (row.hasAttribute("data-content-original")) { - console.log("packing", row.id); - row.setAttribute("data-content", row.getAttribute("data-content-original")); - row.removeAttribute("data-content-original"); - - row.querySelector(".content-inner").innerHTML = " "; - } - }, view: function (id, no_expand) { this.setActive(id); Headlines.scrollToArticleId(id); @@ -328,14 +298,11 @@ const Article = { $$("div[id*=RROW][class*=active]").each((row) => { row.removeClassName("active"); - Article.pack(row); }); const row = $("RROW-" + id); if (row) { - Article.unpack(row); - row.removeClassName("Unread"); row.addClassName("active"); diff --git a/js/Headlines.js b/js/Headlines.js index b98098c33..23dc0b2c2 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -32,15 +32,6 @@ const Headlines = { }, {threshold: [0, 1], root: document.querySelector("#headlines-frame")} ), - unpack_observer: new IntersectionObserver( - (entries, observer) => { - entries.forEach((entry) => { - if (entry.intersectionRatio > 0) - Article.unpack(entry.target); - }); - }, - {threshold: [0], root: document.querySelector("#headlines-frame")} - ), row_observer: new MutationObserver((mutations) => { const modified = []; @@ -369,7 +360,6 @@ const Headlines = { if (hl.active) { new_row.addClassName("active"); - Article.unpack(new_row); if (App.isCombinedMode()) Article.cdmMoveToId(id, {noscroll: true}); @@ -385,11 +375,6 @@ const Headlines = { this.sticky_header_observer.observe(e) }); - if (App.getInitParam("cdm_expanded")) - $$("#headlines-frame > div[id*=RROW].cdm").each((e) => { - this.unpack_observer.observe(e) - }); - }, render: function (headlines, hl) { let row = null; @@ -426,7 +411,6 @@ const Headlines = { id="RROW-${hl.id}" data-article-id="${hl.id}" data-orig-feed-id="${hl.feed_id}" - data-content="${App.escapeHtml(hl.content)}" data-score="${hl.score}" data-article-title="${App.escapeHtml(hl.title)}" onmouseover="Article.mouseIn(${hl.id})" @@ -466,7 +450,7 @@ const Headlines = { <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'}"> - <img src="${App.getInitParam('icon_indicator_white')}"> + ${hl.content} </div> <div class="intermediate"> ${hl.enclosures} @@ -533,6 +517,7 @@ const Headlines = { this.row_observer.observe(tmp.firstChild, {attributes: true}); PluginHost.run(PluginHost.HOOK_HEADLINE_RENDERED, tmp.firstChild); + PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED_CDM, tmp.firstChild); return tmp.firstChild; }, @@ -702,11 +687,6 @@ const Headlines = { this.sticky_header_observer.observe(e) }); - if (App.getInitParam("cdm_expanded")) - $$("#headlines-frame > div[id*=RROW].cdm").each((e) => { - this.unpack_observer.observe(e) - }); - } else { console.error("Invalid object received: " + transport.responseText); dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" + @@ -717,7 +697,7 @@ const Headlines = { Feeds.infscroll_in_progress = 0; // this is used to auto-catchup articles if needed after infscroll request has finished, - // unpack visible articles, fill buffer more, etc + // fill buffer more, etc this.scrollHandler(); Notify.close(); diff --git a/plugins/af_proxy_http/init.php b/plugins/af_proxy_http/init.php index 2d9ae59b5..86f5fc8ce 100644 --- a/plugins/af_proxy_http/init.php +++ b/plugins/af_proxy_http/init.php @@ -239,7 +239,7 @@ class Af_Proxy_Http extends Plugin { function save() { $proxy_all = checkbox_to_sql_bool($_POST["proxy_all"]); - $this->host->set($this, "proxy_all", $proxy_all, false); + $this->host->set($this, "proxy_all", $proxy_all); echo __("Configuration saved"); } |