Changes for page Home

Summary

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

Details

XWiki.JavaScriptExtension[0]

Code

...	...	@@ -17,9 +17,17 @@
17	17	},
18	18	renderEvents(events) {
19	19	console.debug("renderEvents", events);
	20	+ debugger;
	21	+ try {
	22	+ this._renderFun(events);
	23	+ } catch (e) {
	24	+ console.exception(e);
	25	+ }
	26	+ },
	27	+ _renderFun(events) {
20	20	const cf = this.opt("columnFormat") ?? "MMM";
21		- const rf = this.opt("rowFormat") ?? "dd";
22		- const df = this.opt("cellFormat") ?? "ddd";
	29	+ const rf = this.opt("rowFormat") ?? "D";
	30	+ const df = this.opt("cellFormat") ?? "dd";
23	23	const wf = this.opt("weekFormat") ?? "w";
24	24	const colspan = (df || wf) ? (1 + !!df + !!wf) : null;
25	25
...	...	@@ -35,7 +35,7 @@
35	35	days.forEach((arr, day) => arr.push(E("th", {class: "fc-axis"}, ys.clone().add({day}).format(rf))));
36	36	}
37	37
38		- for (const month in Array(12).fill()) {
	46	+ for (const month of range(12)) {
39	39	const ms = ys.clone().add({month})
40	40	const me = ms.clone().add({month: 1});
41	41	const md = me.diff(ms, "days");
...	...	@@ -45,36 +45,36 @@
45	45
46	46	const bgc = new Array(md);
47	47
48		- for (let day = 0; i < 31; i++) {
49		- if (i < md) {
	56	+ for (const day of range(31)) {
	57	+ if (day < md) {
50	50	const ds = ms.clone().add({day});
51	51	const de = ds.clone().add({day: 1});
52	52
53	53	const oc = [];
54		- while(mv[0]?.isBefore(de)) {
	62	+ while(mv[0]?.start.isBefore(de)) {
55	55	const v = mv.shift();
56		- const d = Math.ceil(v.end.min(me).diff(ds, "days", true));
57		- if (t.rendering == "background")
58		- if (t.color)
59		- for (let i=0; i<d; i++)
60		- bgc[day + i] = t.color;
	64	+ const d = Math.ceil(v.end.max(me).diff(ds, "days", true));
	65	+ if (v.rendering == "background")
	66	+ if (v.color)
	67	+ for (const i of range(d))
	68	+ bgc[day + i] = v.color;
61	61	else {
62		- const e = E("div", t.title);
	70	+ const e = E("div", v.title);
63	63	e.style.height = `${100 * d}%`;
64		- if (t.color) e.style.borderColor = e.style.backgroundColor = t.color;
65		- if (t.textColor) e.style.color = t.textColor;
	72	+ if (v.color) e.style.borderColor = e.style.backgroundColor = v.color;
	73	+ if (v.textColor) e.style.color = v.textColor;
66	66	oc.push(e);
67	67	// TODO: soft-columns
68	68	}
69	69	}
70	70
71		- const da = {class: this.getDayClasses(d).join(" ")};
72		- if (df) days[i].push(E("td", da, ds.format(df)));
	79	+ const da = {class: this.getDayClasses(ds).join(" ")};
	80	+ if (df) days[day].push(E("td", da, ds.format(df)));
73	73	if (bgc[day]) da.style = `background-color: ${bgc[day]};`;
74		- days[i].push(E("td", da, oc));
75		- if (wf) days[i].oush(E("td", ds.weekday() ? "" : ds.format(wf)));
	82	+ days[day].push(E("td", da, oc));
	83	+ if (wf) days[day].push(E("td", da, ds.weekday() ? "" : ds.format(wf)));
76	76	} else
77		- days[i].push(E("td", {colspan}));
	85	+ days[day].push(E("td", {colspan}));
78	78	}
79	79	}
80	80
...	...	@@ -86,9 +86,7 @@
86	86	E("tbody", {class: "fc-body"}, days.map(d => E("tr", d))),
87	87	)
88	88	);
89		-
90		- debugger;
91		- },
	97	+ }
92	92	}),
93	93	duration: { year: 1 },
94	94	});