Skip to content

Commit 9193c55

Browse files
committed
Normalize Jelly formatting and add EditorConfig
Signed-off-by: Bob Du <i@bobdu.cc>
1 parent 3af4098 commit 9193c55

File tree

2 files changed

+30
-21
lines changed

2 files changed

+30
-21
lines changed

.editorconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
8+
[*.jelly]
9+
indent_style = tab

src/main/resources/org/jenkinsci/plugins/scriptler/ScriptlerManagement/edit.jelly

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ THE SOFTWARE.
2727
<?jelly escape-by-default='true'?>
2828
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define"
2929
xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:p="/lib/scriptler">
30-
30+
3131
<l:layout title="Scriptler - ${%title}" permission="${it.scriptlerConfigure}" norefresh="true">
3232
<st:once>
3333
<link rel="stylesheet" href="${resURL}/plugin/scriptler/scriptler.css" />
@@ -52,19 +52,19 @@ THE SOFTWARE.
5252
<f:checkbox name="onlyBuiltIn" checked="${script.onlyBuiltIn}" />
5353
</f:entry>
5454
<f:block>
55-
<div class="scriptler-edit-params">
56-
<f:optionalBlock name="defineParams" title="${%ParametersDescription}" checked="${!empty(script.parameters)}">
57-
<f:entry title="${%Parameters}" field="parameters">
58-
<j:set var="deleteText" value="${%DeleteParameter}" />
59-
<f:repeatable var="param" items="${script.parameters}" name="parameters" add="${%AddParameter}"
60-
minimum="1">
61-
<div class="show-if-not-only">
62-
<button class="repeatable-delete danger" type="button" title="${deleteText}" aria-label="${deleteText}">
63-
<l:icon src="symbol-close" />
64-
</button>
65-
</div>
66-
<f:entry title="${%ParameterName}">
67-
<f:textbox name="name" value="${param.name}"/>
55+
<div class="scriptler-edit-params">
56+
<f:optionalBlock name="defineParams" title="${%ParametersDescription}" checked="${!empty(script.parameters)}">
57+
<f:entry title="${%Parameters}" field="parameters">
58+
<j:set var="deleteText" value="${%DeleteParameter}" />
59+
<f:repeatable var="param" items="${script.parameters}" name="parameters" add="${%AddParameter}"
60+
minimum="1">
61+
<div class="show-if-not-only">
62+
<button class="repeatable-delete danger" type="button" title="${deleteText}" aria-label="${deleteText}">
63+
<l:icon src="symbol-close" />
64+
</button>
65+
</div>
66+
<f:entry title="${%ParameterName}">
67+
<f:textbox name="name" value="${param.name}"/>
6868
</f:entry>
6969
<f:entry title="${%ParameterDefaultValue}">
7070
<f:textbox name="value" value="${param.value}"/>
@@ -73,7 +73,7 @@ THE SOFTWARE.
7373
</f:entry>
7474
</f:optionalBlock>
7575
</div>
76-
</f:block>
76+
</f:block>
7777
<f:entry title="${%Script}">
7878
<textarea id="script" name="script" class="script">
7979
<j:choose>
@@ -96,14 +96,14 @@ THE SOFTWARE.
9696
<j:otherwise>
9797
<div class="warning">${%NotApprovedYet}</div>
9898
</j:otherwise>
99-
</j:choose>
99+
</j:choose>
100100
<br />
101101
</j:if>
102102
<f:submit value="${%Save}" />
103103
</f:block>
104-
</f:form>
105-
</l:main-panel>
106-
</l:layout>
107-
<st:adjunct includes="org.kohsuke.stapler.codemirror.mode.clike.clike"/>
108-
<st:adjunct includes="org.kohsuke.stapler.codemirror.theme.default"/>
104+
</f:form>
105+
</l:main-panel>
106+
</l:layout>
107+
<st:adjunct includes="org.kohsuke.stapler.codemirror.mode.clike.clike" />
108+
<st:adjunct includes="org.kohsuke.stapler.codemirror.theme.default" />
109109
</j:jelly>

0 commit comments

Comments
 (0)