valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shorten_expanded: use dojo button, don't break attachment dropdown, other fixes

This commit is contained in:
Andrew Dolgov 2018-12-07 22:56:34 +03:00
parent c1d9cd3c22
commit 7adf937936
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/shorten_expanded/init.css
View File

@ -1,9 +1,9 @@
div.contentSizeWrapper { .content-shrink-wrap {
overflow : hidden; overflow : hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
height : 800px; height : 800px;
} }
button.expandPrompt { .expand-prompt {
margin-top : 20px; margin-top : 16px;
} }

32
plugins/shorten_expanded/init.js
View File

@ -1,17 +1,19 @@
var _shorten_expanded_threshold = 1.5; //window heights const _shorten_expanded_threshold = 1.5; //window heights
function expandSizeWrapper(id) { Plugins.Shorten_Expanded = {
expand: function(id) {
const row = $(id); const row = $(id);
if (row) { if (row) {
const content = row.select(".contentSizeWrapper")[0]; const content = row.select(".content-shrink-wrap")[0];
const link = row.select(".expandPrompt")[0]; const link = row.select(".expand-prompt")[0];
if (content) content.removeClassName("contentSizeWrapper"); if (content) content.removeClassName("content-shrink-wrap");
if (link) Element.hide(link); if (link) Element.hide(link);
} }
return false; return false;
}
} }
require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) { require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) {
@ -19,19 +21,27 @@ require(['dojo/_base/kernel', 'dojo/ready'], function (dojo, ready) {
PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) { PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
window.setTimeout(function() { window.setTimeout(function() {
if (row) { if (row) {
const c_inner = row.select(".content-inner")[0]; const c_inner = row.select(".content-inner")[0];
const c_inter = row.select(".intermediate")[0]; const c_inter = row.select(".intermediate")[0];
if (c_inner && c_inter && if (c_inner && c_inter &&
row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) { row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
c_inter.parentNode.removeChild(c_inter); let tmp = document.createElement("div");
c_inner.innerHTML = "<div class='contentSizeWrapper'>" + c_inter.select("> *:not([class*='attachments'])").each(function(p) {
c_inner.innerHTML + p.parentNode.removeChild(p);
c_inter.innerHTML + "</div>" + tmp.appendChild(p);
"<button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' href='#'>" + });
__("Click to expand article") + "</button>";
c_inner.innerHTML = `<div class="content-shrink-wrap">
${c_inner.innerHTML}
${tmp.innerHTML}</div>
<button dojoType="dijit.form.Button" class="alt-info expand-prompt" onclick="return Plugins.Shorten_Expanded.expand('${row.id}')" href="#">
${__("Click to expand article")}</button>`;
dojo.parser.parse(c_inner);
Headlines.unpackVisible(); Headlines.unpackVisible();
} }