aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugo Hörnquist <hugo@lysator.liu.se>2021-05-17 01:47:06 +0200
committerHugo Hörnquist <hugo@lysator.liu.se>2021-05-17 01:47:06 +0200
commit1ea55f07506194af34bcba5c836f592e45bfe9e3 (patch)
tree77ffed0ebe3e6294f4e9420f2e12fb976130eb92
parentMerge branch 'jcal' (diff)
downloadcalp-1ea55f07506194af34bcba5c836f592e45bfe9e3.tar.gz
calp-1ea55f07506194af34bcba5c836f592e45bfe9e3.tar.xz
Fix & not becoming &amp; in XML.
-rw-r--r--static/binders.js2
-rw-r--r--static/jcal.js24
-rw-r--r--static/vcal.js2
3 files changed, 14 insertions, 14 deletions
diff --git a/static/binders.js b/static/binders.js
index 12d968e4..81a42d89 100644
--- a/static/binders.js
+++ b/static/binders.js
@@ -89,7 +89,7 @@ function bind_edit(el, e) {
}
function bind_view(el, e) {
- let f = (s, v) => s.innerHTML = v.format(s.dataset && s.dataset.fmt);
+ let f = (s, v) => s.innerText = v.format(s.dataset && s.dataset.fmt);
el.properties.get_callback_list(e.dataset.property).push([e, f]);
}
diff --git a/static/jcal.js b/static/jcal.js
index da17a19e..003294d1 100644
--- a/static/jcal.js
+++ b/static/jcal.js
@@ -2,25 +2,25 @@ function jcal_type_to_xcal(doc, type, value) {
let el = doc.createElementNS(xcal, type);
switch (type) {
case 'boolean':
- el.innerHTML = value ? "true" : "false";
+ el.textContent = value ? "true" : "false";
break;
case 'float':
case 'integer':
- el.innerHTML = '' + value;
+ el.textContent = '' + value;
break;
case 'period':
let [start, end] = value;
let startEl = doc.createElementNS(xcal, 'start');
- startEl.innerHTML = start;
+ startEl.textContent = start;
let endEL;
if (end.find('P')) {
endEl = doc.createElementNS(xcal, 'duration');
} else {
endEl = doc.createElementNS(xcal, 'end');
}
- endEl.innerHTML = end;
+ endEl.textContent = end;
el.appendChild(startEl);
el.appendChild(endEl);
break;
@@ -29,7 +29,7 @@ function jcal_type_to_xcal(doc, type, value) {
for (var key in value) {
if (! value.hasOwnProperty(key)) continue;
let e = doc.createElementNS(xcal, key);
- e.innerHTML = value[key];
+ e.textContent = value[key];
el.appendChild(e);
}
break;
@@ -45,7 +45,7 @@ function jcal_type_to_xcal(doc, type, value) {
case 'uri':
case 'cal-address':
case 'utc-offset':
- el.innerHTML = value;
+ el.textContent = value;
break;
default:
@@ -77,7 +77,7 @@ function jcal_property_to_xcal_property(doc, jcal) {
for (let v of asList(params[key])) {
let text = doc.createElementNS(xcal, 'text');
- text.innerHTML = '' + v;
+ text.textContent = '' + v;
el.appendChild(text);
}
@@ -98,8 +98,8 @@ function jcal_property_to_xcal_property(doc, jcal) {
let [x, y] = values[0];
let lat = doc.createElementNS(xcal, 'latitude')
let lon = doc.createElementNS(xcal, 'longitude')
- lat.innerHTML = x;
- lon.innerHTML = y;
+ lat.textContent = x;
+ lon.textContent = y;
tag.appendChild(lat);
tag.appendChild(lon);
} else {
@@ -111,18 +111,18 @@ function jcal_property_to_xcal_property(doc, jcal) {
// assert values[0] instanceof Array
let [code, desc, ...data] = values[0];
let codeEl = doc.createElementNS(xcal, 'code')
- code.innerHTML = code;
+ code.textContent = code;
tag.appendChild(codeEl);
let descEl = doc.createElementNS(xcal, 'description')
- desc.innerHTML = desc;
+ desc.textContent = desc;
tag.appendChild(descEl);
if (data !== []) {
data = data[0];
let dataEl = doc.createElementNS(xcal, 'data')
- data.innerHTML = data;
+ data.textContent = data;
tag.appendChild(dataEl);
}
} else {
diff --git a/static/vcal.js b/static/vcal.js
index 079b09f8..0601d714 100644
--- a/static/vcal.js
+++ b/static/vcal.js
@@ -68,7 +68,7 @@ class VComponent {
// }
let f = (s, v) => {
console.log(s, v);
- s.innerHTML = v.format(s.dataset && s.dataset.fmt);
+ s.innerText = v.format(s.dataset && s.dataset.fmt);
};
this.get_callback_list(e.dataset.property).push([e, f]);
// if (e.classList.contains('summary')) {