Skip to content

Use textContent to avoid HTML special characters in options #5782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2022
Merged

Use textContent to avoid HTML special characters in options #5782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bf507e
Use textContent to avoid HTML special characters in options
ggorlen Sep 1, 2022
5137aa0
Add test for textContent for select option names
ggorlen Sep 1, 2022
028a502
Add length check to select unit test
ggorlen Sep 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/dom/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ p5.prototype.createSelect = function() {
}
//see if there is already an option with this name
for (let i = 0; i < this.elt.length; i += 1) {
if (this.elt[i].innerHTML === name) {
if (this.elt[i].textContent === name) {
index = i;
break;
}
Expand All @@ -722,7 +722,7 @@ p5.prototype.createSelect = function() {
} else {
//if it doesn't exist create it
const opt = document.createElement('option');
opt.innerHTML = name;
opt.textContent = name;
opt.value = value === undefined ? name : value;
this.elt.appendChild(opt);
this._pInst._elements.push(opt);
Expand Down
9 changes: 9 additions & 0 deletions test/unit/dom/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,15 @@ suite('DOM', function() {
}
});

test('should update select value when HTML special characters are in the name', function() {
testElement = myp5.createSelect(true);
testElement.option('&', 'foo');
assert.equal(testElement.elt.options.length, 1);
assert.equal(testElement.elt.options[0].value, 'foo');
testElement.option('&', 'bar');
assert.equal(testElement.elt.options[0].value, 'bar');
});

test('calling selected(value) should updated selectedIndex', function() {
testElement = myp5.createSelect(true);
options = ['Sunday', 'Monday', 'Tuesday', 'Friday'];
Expand Down