Changes for page Helpers

Summary

• Objects (1 modified, 0 added, 0 removed)
  • XWiki.JavaScriptExtension[0]

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -1,19 +1,15 @@
1		-const livetableRowHook = {};
	1	+define("xwiki-custom-livetable", [], function () {
	2	+ const func = (tabName, rowFunc, colTT = {}) => {
	3	+ let tagCols;
2	2
3		-((() => {
4		- const tagCols = {};
	5	+ document.observe('xwiki:livetable:loading', () => {
	6	+ const tab = document.getElementById(tabName);
	7	+ if (!tab) return;
5	5
6		- document.observe('xwiki:livetable:loading', () => {
7		- for (const tab of document.querySelectorAll(".xwiki-livetable")) {
8		- const tableId = tab.id;
9		- if (!tableId) continue;
10		- console.debug("loading", tableId);
11		-
12	12	// coulmn data sources
13	13	const conf = JSON.parse(tab.dataset.settings);
14		-
15		- tagCols[tableId] = (conf.columnDescriptors.tags ?? { aux: [] }).aux ?? [["Tags", true]];
16		- tagCols[tableId].forEach(([name], i) => {
	11	+ tagCols = (conf.columnDescriptors.tags ?? { aux: [] }).aux ?? [["Tags", true]];
	12	+ tagCols.forEach(([name], i) => {
17	17	const cn = `tags-${i}`;
18	18	conf.columns.splice(conf.columns.indexOf("tags"), 1, cn);
19	19	conf.columnDescriptors[cn] = {
...	...	@@ -27,7 +27,7 @@
27	27
28	28	// column headers
29	29	tab.querySelectorAll(".xwiki-livetable-display-header .tagsCol").forEach(
30		- (v, i) => v.textContent = tagCols[tableId][i][0]
	26	+ (v, i) => v.textContent = tagCols[i][0]
31	31	);
32	32
33	33	// column tooltips
...	...	@@ -34,7 +34,7 @@
34	34	tab.querySelectorAll(".xwiki-livetable-display-header-text").forEach(
35	35	el => {
36	36	const t = el.textContent.trim();
37		- const c = conf.columnDescriptors[t]?.tooltip;
	33	+ const c = conf.columnDescriptors[t].tooltip ?? colTT[t];
38	38	if (c) {
39	39	el.title = t;
40	40	el.dataset.content = c;
...	...	@@ -45,7 +45,7 @@
45	45	)
46	46
47	47	// handle clicks for tags
48		- tab.getElementsByClassName("xwiki-livetable-display-body")[0].addEventListener("click", ev => {
	44	+ document.getElementById(`${tabName}-display`).addEventListener("click", ev => {
49	49	if (ev.button) return; // only left click
50	50	if (ev.target.nodeName !== "SPAN") return;
51	51	if (!ev.target.classList.contains("ltTag")) return;
...	...	@@ -58,28 +58,26 @@
58	58	lt.tags = Object.keys(st);
59	59	lt.clearCache();
60	60	lt.showRows(1, lt.limit);
61		- });
	57	+ })
	58	+ });
62	62
63		- }
64		- });
	60	+ document.observe(`xwiki:livetable:${tabName}:receivedEntries`, ({ memo: { data } }) => {
	61	+ for (const row of data.rows) {
	62	+ if (rowFunc) rowFunc(row)
65	65
66		- document.observe("xwiki:livetable:receivedEntries", ({ memo: { data }, tableId }) => {
67		- console.debug("receivedEntries", tableId, data);
68		- const rf = livetableRowHook[tableId];
69		- for (const row of data.rows) {
70		- if (rf) rf(row);
	64	+ // tags
	65	+ const tags = new Set(row.tags_value.slice(1, -1).split(", "));
	66	+ tagCols.forEach(([name, ...want], i) =>
	67	+ row[`tags-${i}`] = (
	68	+ want[0] === true
	69	+ ? Array.from(tags)
	70	+ : want.filter(tag => tags.delete(tag))
	71	+ ).sort().map(tag => `<span class="ltTag" style="cursor:pointer;">${tag}</span>`).join(", ")
	72	+ );
	73	+ }
	74	+ });
	75	+ };
71	71
72		- // tags
73		- const tags = new Set(row.tags_value.slice(1, -1).split(", "));
74		- tagCols[tableId]?.forEach(([name, ...want], i) =>
75		- row[`tags-${i}`] = (
76		- want[0] === true
77		- ? Array.from(tags)
78		- : want.filter(tag => tags.delete(tag))
79		- ).sort().map(tag => `<span class="ltTag" style="cursor:pointer;">${tag}</span>`).join(", ")
80		- );
81		- }
82		- });
83		-
84		-})());
85		-
	77	+ func.func = func;
	78	+ return func;
	79	+});