Skip to content

Commit 0505b32

Browse files
committed
Simplify JS + hopefully fix test
1 parent 9673212 commit 0505b32

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

src/main/js/add-item.js

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,17 @@ document.addEventListener("DOMContentLoaded", () => {
139139
desc.className = "jenkins-choice-list__item__description";
140140
desc.innerHTML = checkForLink(elem.description);
141141

142-
function select(e) {
143-
e.preventDefault();
142+
function select() {
144143
cleanCopyFromOption();
145144
cleanItemSelection();
146-
147-
radio.checked = true;
148-
149145
setFieldValidationStatus("items", true);
146+
150147
if (getFieldValidationStatus("name")) {
151148
refreshSubmitButtonState();
152149
}
153150
}
154151

155-
item.addEventListener("click", select);
156-
item.addEventListener("keydown", function (evt) {
157-
if (evt.code === "Space" || evt.code === "Enter") {
158-
this.click();
159-
evt.stopPropagation();
160-
}
161-
});
152+
radio.addEventListener("change", select);
162153

163154
return item;
164155
}

test/src/test/java/hudson/model/ViewTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,8 @@ void newJob_xssPreventedInId() throws Exception {
844844

845845
HtmlPage page = wc.goTo("view/all/newJob");
846846

847-
Object result = page.executeJavaScript("Array.from(document.querySelectorAll('.jenkins-choice-list__item__label')).filter(el => el.innerText.indexOf('" + customizableTLID.customDisplayName + "') !== -1)[0].parentElement.parentElement").getJavaScriptResult();
847+
Object result = page.executeJavaScript("Array.from(document.querySelectorAll('.jenkins-choice-list__item__label'))" +
848+
".filter(el => el.innerText.indexOf('" + customizableTLID.customDisplayName + "') !== -1)[0].parentElement.parentElement").getJavaScriptResult();
848849
assertThat(result, instanceOf(HTMLElement.class));
849850
HTMLElement resultElement = (HTMLElement) result;
850851
assertThat(resultElement.getAttribute("onclick"), nullValue());

0 commit comments

Comments
 (0)