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

keep track of selected prompt and floating title status using headline row mutation observer

This commit is contained in:
Andrew Dolgov 2018-12-10 19:51:20 +03:00
parent f96cdb7d5d
commit 6616c7cf67
2 changed files with 41 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
js/Article.js
View File

@ -97,6 +97,8 @@ define(["dojo/_base/declare"], function (declare) {
if (dijit.byId("content-insert")) if (dijit.byId("content-insert"))
dijit.byId("headlines-wrap-inner").removeChild( dijit.byId("headlines-wrap-inner").removeChild(
dijit.byId("content-insert")); dijit.byId("content-insert"));
Article.setActive(0);
}, },
displayUrl: function (id) { displayUrl: function (id) {
const query = {op: "rpc", method: "getlinktitlebyid", id: id}; const query = {op: "rpc", method: "getlinktitlebyid", id: id};
@ -300,7 +302,7 @@ define(["dojo/_base/declare"], function (declare) {
Headlines.catchupBatched(() => { Headlines.catchupBatched(() => {
Feeds.decrementFeedCounter(Feeds.getActive(), Feeds.activeIsCat()); Feeds.decrementFeedCounter(Feeds.getActive(), Feeds.activeIsCat());
Headlines.toggleUnread(id, 0); Headlines.toggleUnread(id, 0);
Headlines.updateFloatingTitle(true); //Headlines.updateFloatingTitle(true);
}); });
} }
@ -315,7 +317,7 @@ define(["dojo/_base/declare"], function (declare) {
PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, this._active_article_id); PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, this._active_article_id);
} }
Headlines.updateSelectedPrompt(); //Headlines.updateSelectedPrompt();
}, },
getActive: function () { getActive: function () {
return this._active_article_id; return this._active_article_id;
@ -334,26 +336,6 @@ define(["dojo/_base/declare"], function (declare) {
} }
}, },
getRelativeIds: function (id, limit) {
const tmp = [];
if (!limit) limit = 6; //3
const ids = Headlines.getLoaded();
for (let i = 0; i < ids.length; i++) {
if (ids[i] == id) {
for (let k = 1; k <= limit; k++) {
//if (i > k-1) tmp.push(ids[i-k]);
if (i < ids.length - k) tmp.push(ids[i + k]);
}
break;
}
}
return tmp;
},
mouseIn: function (id) { mouseIn: function (id) {
this.post_under_pointer = id; this.post_under_pointer = id;
}, },

118
js/Headlines.js
View File

@ -7,6 +7,32 @@ define(["dojo/_base/declare"], function (declare) {
headlines: [], headlines: [],
current_first_id: 0, current_first_id: 0,
catchup_id_batch: [], catchup_id_batch: [],
row_observer: new MutationObserver((mutations) => {
mutations.each((m) => {
if (m.type == 'attributes' && m.attributeName == 'class') {
const row = m.target;
const id = row.getAttribute("data-article-id");
if (Headlines.headlines[id]) {
const hl = Headlines.headlines[id];
if (hl) {
hl.unread = row.hasClassName("Unread");
hl.marked = row.hasClassName("marked");
hl.published = row.hasClassName("published");
// not sent by backend
hl.selected = row.hasClassName("Selected");
hl.active = row.hasClassName("active");
}
}
}
})
Headlines.updateSelectedPrompt();
Headlines.updateFloatingTitle(true);
}),
click: function (event, id, in_body) { click: function (event, id, in_body) {
in_body = in_body || false; in_body = in_body || false;
@ -201,14 +227,6 @@ define(["dojo/_base/declare"], function (declare) {
PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, row); PluginHost.run(PluginHost.HOOK_FLOATING_TITLE, row);
} }
//ft.style.marginRight = hf.offsetWidth - row.offsetWidth + "px";
/* if (header.offsetTop + header.offsetHeight < hf.scrollTop + ft.offsetHeight - 5 &&
row.offsetTop + row.offsetHeight >= hf.scrollTop + ft.offsetHeight - 5)
Element.show(ft);
else
Element.hide(ft); */
if (hf.scrollTop - row.offsetTop <= header.offsetHeight + safety_offset) if (hf.scrollTop - row.offsetTop <= header.offsetHeight + safety_offset)
ft.fade({duration: 0.2}); ft.fade({duration: 0.2});
else else
@ -242,18 +260,14 @@ define(["dojo/_base/declare"], function (declare) {
$$("#headlines-frame > div[id*=RROW]").each((row) => { $$("#headlines-frame > div[id*=RROW]").each((row) => {
const id = row.getAttribute("data-article-id"); const id = row.getAttribute("data-article-id");
const selected = row.hasClassName("Selected"); const hl = this.headlines[id];
const active = row.hasClassName("active");
const marked = row.hasClassName("marked");
const published = row.hasClassName("published");
const unread = row.hasClassName("Unread");
if (this.headlines[id]) { if (hl) {
const new_row = this.render({}, this.headlines[id]); const new_row = this.render({}, hl);
row.parentNode.replaceChild(new_row, row); row.parentNode.replaceChild(new_row, row);
if (active) { if (hl.active) {
new_row.addClassName("active"); new_row.addClassName("active");
if (App.isCombinedMode()) if (App.isCombinedMode())
@ -262,22 +276,7 @@ define(["dojo/_base/declare"], function (declare) {
Article.view(id); Article.view(id);
} }
if (selected) this.select("all", id); if (hl.selected) this.select("all", id);
if (marked)
new_row.addClassName("marked");
else
new_row.removeClassName("marked");
if (published)
new_row.addClassName("published");
else
new_row.removeClassName("published");
if (unread)
new_row.addClassName("Unread");
else
new_row.removeClassName("Unread");
Article.unpack(new_row); Article.unpack(new_row);
@ -412,6 +411,8 @@ define(["dojo/_base/declare"], function (declare) {
tmp.innerHTML = row; tmp.innerHTML = row;
dojo.parser.parse(tmp); dojo.parser.parse(tmp);
this.row_observer.observe(tmp.firstChild, {attributes: true});
PluginHost.run(PluginHost.HOOK_HEADLINE_RENDERED, tmp.firstChild); PluginHost.run(PluginHost.HOOK_HEADLINE_RENDERED, tmp.firstChild);
return tmp.firstChild; return tmp.firstChild;
@ -476,27 +477,12 @@ define(["dojo/_base/declare"], function (declare) {
for (let i = 0; i < reply['headlines']['content'].length; i++) { for (let i = 0; i < reply['headlines']['content'].length; i++) {
const hl = reply['headlines']['content'][i]; const hl = reply['headlines']['content'][i];
$("headlines-frame").appendChild( $("headlines-frame").appendChild(this.render(reply['headlines'], hl));
this.render(reply['headlines'], hl));
this.headlines[parseInt(hl.id)] = hl; this.headlines[parseInt(hl.id)] = hl;
} }
} }
/* let tmp = document.createElement("div");
tmp.innerHTML = reply['headlines']['content'];
dojo.parser.parse(tmp);
while (tmp.hasChildNodes()) {
const row = tmp.removeChild(tmp.firstChild);
if (this.loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) {
dijit.byId("headlines-frame").domNode.appendChild(row);
this.loaded_article_ids.push(row.id);
}
} */
let hsp = $("headlines-spacer"); let hsp = $("headlines-spacer");
if (!hsp) { if (!hsp) {
@ -520,35 +506,19 @@ define(["dojo/_base/declare"], function (declare) {
} else if (headlines_count > 0 && feed_id == Feeds.getActive() && is_cat == Feeds.activeIsCat()) { } else if (headlines_count > 0 && feed_id == Feeds.getActive() && is_cat == Feeds.activeIsCat()) {
const c = dijit.byId("headlines-frame"); const c = dijit.byId("headlines-frame");
//const ids = Headlines.getSelected();
let hsp = $("headlines-spacer"); let hsp = $("headlines-spacer");
if (hsp) if (hsp)
c.domNode.removeChild(hsp); c.domNode.removeChild(hsp);
/* let tmp = document.createElement("div");
tmp.innerHTML = reply['headlines']['content'];
dojo.parser.parse(tmp);
while (tmp.hasChildNodes()) {
let row = tmp.removeChild(tmp.firstChild);
if (this.loaded_article_ids.indexOf(row.id) == -1 || row.hasClassName("feed-title")) {
dijit.byId("headlines-frame").domNode.appendChild(row);
this.loaded_article_ids.push(row.id);
}
} */
if (typeof reply['headlines']['content'] == 'string') { if (typeof reply['headlines']['content'] == 'string') {
$("headlines-frame").innerHTML = reply['headlines']['content']; $("headlines-frame").innerHTML = reply['headlines']['content'];
} else { } else {
for (let i = 0; i < reply['headlines']['content'].length; i++) { for (let i = 0; i < reply['headlines']['content'].length; i++) {
const hl = reply['headlines']['content'][i]; const hl = reply['headlines']['content'][i];
$("headlines-frame").appendChild( $("headlines-frame").appendChild(this.render(reply['headlines'], hl));
this.render(reply['headlines'], hl));
this.headlines[parseInt(hl.id)] = hl; this.headlines[parseInt(hl.id)] = hl;
} }
@ -561,12 +531,6 @@ define(["dojo/_base/declare"], function (declare) {
c.domNode.appendChild(hsp); c.domNode.appendChild(hsp);
/* console.log("restore selected ids: " + ids);
for (let i = 0; i < ids.length; i++) {
markHeadline(ids[i]);
} */
this.initHeadlinesMenu(); this.initHeadlinesMenu();
if (Feeds.infscroll_disabled) { if (Feeds.infscroll_disabled) {
@ -663,7 +627,6 @@ define(["dojo/_base/declare"], function (declare) {
xhrPost("backend.php", query, (transport) => { xhrPost("backend.php", query, (transport) => {
App.handleRpcJson(transport); App.handleRpcJson(transport);
if (callback) callback(transport); if (callback) callback(transport);
Headlines.updateFloatingTitle(true);
}); });
}, },
selectionToggleMarked: function (ids) { selectionToggleMarked: function (ids) {
@ -718,8 +681,6 @@ define(["dojo/_base/declare"], function (declare) {
row.toggleClassName("marked"); row.toggleClassName("marked");
query.mark = row.hasClassName("marked") ? 1 : 0; query.mark = row.hasClassName("marked") ? 1 : 0;
Headlines.updateFloatingTitle(true);
if (!client_only) if (!client_only)
xhrPost("backend.php", query, (transport) => { xhrPost("backend.php", query, (transport) => {
App.handleRpcJson(transport); App.handleRpcJson(transport);
@ -735,8 +696,6 @@ define(["dojo/_base/declare"], function (declare) {
row.toggleClassName("published"); row.toggleClassName("published");
query.pub = row.hasClassName("published") ? 1 : 0; query.pub = row.hasClassName("published") ? 1 : 0;
Headlines.updateFloatingTitle(true);
if (!client_only) if (!client_only)
xhrPost("backend.php", query, (transport) => { xhrPost("backend.php", query, (transport) => {
App.handleRpcJson(transport); App.handleRpcJson(transport);
@ -861,7 +820,6 @@ define(["dojo/_base/declare"], function (declare) {
xhrPost("backend.php", xhrPost("backend.php",
{op: "rpc", method: "catchupSelected", cmode: cmode, ids: id}, (transport) => { {op: "rpc", method: "catchupSelected", cmode: cmode, ids: id}, (transport) => {
App.handleRpcJson(transport); App.handleRpcJson(transport);
Headlines.updateFloatingTitle(true);
}); });
} }
}, },
@ -974,7 +932,7 @@ define(["dojo/_base/declare"], function (declare) {
row.removeClassName("Selected"); row.removeClassName("Selected");
} }
this.updateSelectedPrompt(); //this.updateSelectedPrompt();
}, },
select: function (mode, articleId) { select: function (mode, articleId) {
// mode = all,none,unread,invert,marked,published // mode = all,none,unread,invert,marked,published
@ -1029,7 +987,7 @@ define(["dojo/_base/declare"], function (declare) {
cb.attr("checked", true); cb.attr("checked", true);
} }
Headlines.updateSelectedPrompt(); //Headlines.updateSelectedPrompt();
} }
}, },
archiveSelection: function () { archiveSelection: function () {
@ -1114,8 +1072,6 @@ define(["dojo/_base/declare"], function (declare) {
}); });
} }
Headlines.updateFloatingTitle(true);
if (callback) callback(); if (callback) callback();
}); });
} else { } else {