Skip to content

Commit 5465ce1

Browse files
[JENKINS-74013] Extract inline JavaScript event handler from SubversionSCMSource (#322)
1 parent 53233cf commit 5465ce1

File tree

9 files changed

+16
-10
lines changed

9 files changed

+16
-10
lines changed

src/main/java/jenkins/scm/impl/subversion/SubversionSCMSource.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -938,10 +938,7 @@ public FormValidation doCheckCredentialsId(StaplerRequest req, @AncestorInPath I
938938
} catch (SVNException e) {
939939
LOGGER.log(Level.INFO, "Failed to access subversion repository "+url,e);
940940
String message = hudson.scm.subversion.Messages.SubversionSCM_doCheckRemote_exceptionMsg1(
941-
Util.escape(url), Util.escape(e.getErrorMessage().getFullMessage()),
942-
"javascript:document.getElementById('svnerror').style.display='block';"
943-
+ "document.getElementById('svnerrorlink').style.display='none';"
944-
+ "return false;")
941+
Util.escape(url), Util.escape(e.getErrorMessage().getFullMessage()))
945942
+ "<br/><pre id=\"svnerror\" style=\"display:none\">"
946943
+ Util.xmlEscape(Functions.printThrowable(e)) + "</pre>";
947944
return FormValidation.errorWithMarkup(message);

src/main/resources/hudson/scm/subversion/Messages.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SubversionSCM.doCheckRemote.badPath=\
2828
SubversionSCM.doCheckRemote.badPathSuggest=\
2929
"{0}/{1}" doesn''t exist in the repository. Maybe you meant "{0}{2}"?
3030
SubversionSCM.doCheckRemote.exceptionMsg1=\
31-
Unable to access {0} : {1} <a href="#" id="svnerrorlink" onclick="{2}">(show details)</a>
31+
Unable to access {0} : {1} <a href="#" id="svnerrorlink">(show details)</a>
3232
SubversionSCM.doCheckRemote.exceptionMsg2=\
3333
(Maybe you need to <a href="{0}" target="_blank">enter credential</a>?)
3434
SubversionSCM.doCheckRemote.invalidUrl=Invalid URL syntax

src/main/resources/hudson/scm/subversion/Messages_de.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SubversionSCM.doCheckRemote.badPath=\
2626
SubversionSCM.doCheckRemote.badPathSuggest=\
2727
"{0}/{1}" existiert nicht im Repository. Meinten Sie vielleicht "{0}{2}"?
2828
SubversionSCM.doCheckRemote.exceptionMsg1=\
29-
Kein Zugriff auf {0} : {1} <a href="#" id="svnerrorlink" onclick="{2}">(Details)</a>
29+
Kein Zugriff auf {0} : {1} <a href="#" id="svnerrorlink">(Details)</a>
3030
SubversionSCM.doCheckRemote.exceptionMsg2=\
3131
(Vielleicht müssen Sie sich zuvor <a href="{0}" target="_blank">authentifizieren</a>?)
3232
SubversionSCM.doCheckRemote.invalidUrl=\

src/main/resources/hudson/scm/subversion/Messages_es.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SubversionTagAction.DisplayName.HasNoTag=Etiquetar esta ejecuci
1111
SubversionSCM.doCheckRemote.badPath={0} no existe en el repositorio
1212

1313
SubversionSCM.doCheckRemote.exceptionMsg1=\
14-
Acceso imposible a {0} : {1} <a href="#" id="svnerrorlink" onclick="{2}">(ver detalles)</a>
14+
Acceso imposible a {0} : {1} <a href="#" id="svnerrorlink">(ver detalles)</a>
1515

1616
SubversionTagAction.DisplayName.HasTags=Etiquetas
1717
SubversionTagAction.Tooltip=Etiquetado

src/main/resources/hudson/scm/subversion/Messages_fr.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SubversionSCM.doCheckRemote.badPath=\
2727
SubversionSCM.doCheckRemote.badPathSuggest=\
2828
"{0}/{1}" n''existe pas dans le d\u00e9p\u00f4t. Vous pensiez peut-\u00eatre \u00e0 "{0}{2}" ?
2929
SubversionSCM.doCheckRemote.exceptionMsg1=\
30-
Impossible d''acc\u00e9der \u00e0 {0} : {1} <a href="#" id="svnerrorlink" onclick="{2}">(voir les d\u00e9tails)</a>
30+
Impossible d''acc\u00e9der \u00e0 {0} : {1} <a href="#" id="svnerrorlink">(voir les d\u00e9tails)</a>
3131
SubversionSCM.doCheckRemote.exceptionMsg2=\
3232
(Vous avez peut-\u00eatre besoin de <a href="{0}" target="_blank">saisir des identifiants</a> ?)
3333
SubversionSCM.doCheckRemote.invalidUrl=\

src/main/resources/hudson/scm/subversion/Messages_ja.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ SubversionSCM.doCheckRemote.badPath=\
2727
SubversionSCM.doCheckRemote.badPathSuggest=\
2828
"{0}/{1}" \u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u5b58\u5728\u3057\u307e\u305b\u3093\u3002"{0}{2}"\u3067\u306f\u306a\u3044\u3067\u3059\u304b?
2929
SubversionSCM.doCheckRemote.exceptionMsg1=\
30-
{0}\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002 : {1} <a href="#" id="svnerrorlink" onclick="{2}">(\u8a73\u7d30)</a>
30+
{0}\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093\u3002 : {1} <a href="#" id="svnerrorlink">(\u8a73\u7d30)</a>
3131
SubversionSCM.doCheckRemote.exceptionMsg2=\
3232
(<a href="{0}" target="_blank">\u8a8d\u8a3c\u3092\u5165\u529b</a>\u3059\u308b\u5fc5\u8981\u304c\u3042\u308b\u304b\u3082\u3057\u308c\u307e\u305b\u3093)
3333
SubversionSCM.doCheckRemote.invalidUrl=\

src/main/resources/hudson/scm/subversion/Messages_zh_TW.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SubversionSCM.doCheckRemote.badPath=\
2828
SubversionSCM.doCheckRemote.badPathSuggest=\
2929
\u5132\u5b58\u5eab\u88e1\u6c92\u6709 "{0}/{1}"\u3002\u60a8\u6307\u7684\u662f "{0}{2}" \u55ce?
3030
SubversionSCM.doCheckRemote.exceptionMsg1=\
31-
\u7121\u6cd5\u5b58\u53d6 {0} : {1} <a href="#" id="svnerrorlink" onclick="{2}">(\u986f\u793a\u8a73\u7d30\u8cc7\u6599)</a>
31+
\u7121\u6cd5\u5b58\u53d6 {0} : {1} <a href="#" id="svnerrorlink">(\u986f\u793a\u8a73\u7d30\u8cc7\u6599)</a>
3232
SubversionSCM.doCheckRemote.exceptionMsg2=\
3333
(\u6216\u8a31\u60a8\u8a72<a href="{0}" target="_blank">\u8f38\u5165\u6191\u8b49</a> \u4e86?)
3434
SubversionSCM.doCheckRemote.invalidUrl=\

src/main/resources/jenkins/scm/impl/subversion/SubversionSCMSource/config-detail.jelly

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
27+
<st:adjunct includes="jenkins.scm.impl.subversion.SubversionSCMSource.resource"/>
2728
<f:entry title="${%Project Repository Base}" field="remoteBase">
2829
<f:textbox/>
2930
</f:entry>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Behaviour.specify("#svnerrorlink", "SubversionSCMSource_showDetails", 0, (element) => {
2+
element.addEventListener("click", (event) => {
3+
event.preventDefault();
4+
5+
document.getElementById("svnerror").style.display = "block";
6+
event.target.style.display = "none";
7+
});
8+
});

0 commit comments

Comments
 (0)