Skip to content

Commit 7dd08e6

Browse files
committed
Add noDefer for settings-subpage
1 parent 07d2ff1 commit 7dd08e6

File tree

1 file changed

+29
-19
lines changed

1 file changed

+29
-19
lines changed

core/src/main/resources/lib/layout/settings-subpage.jelly

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ THE SOFTWARE.
4949
Optional breadcrumb, will add a breadcrumb for the current <code>it</code>
5050
]]>
5151
</st:attribute>
52+
<st:attribute name="noDefer">
53+
Optional, disables the deferred loading for the page.
54+
This can be useful if you need to access 'request2' or do advanced JavaScript.
55+
Defaults to false if not set.
56+
</st:attribute>
5257
</st:documentation>
5358

5459
<j:new className="hudson.model.ManageJenkinsAction" var="manageJenkinsAction" />
@@ -105,30 +110,35 @@ THE SOFTWARE.
105110
<div class="app-settings-container__inner">
106111
<j:if test="${!attrs.containsKey('header')}">
107112
<l:app-bar title="${managementLink.displayName}" />
108-
<j:if test="${!empty(managementLink.description)}">
109-
<div class="jenkins-page-description">
110-
${managementLink.description}
111-
</div>
112-
</j:if>
113+
<div class="jenkins-page-description">
114+
${managementLink.description}
115+
</div>
113116
</j:if>
114117

115118
<j:out value="${attrs.header}" />
116119

117-
<l:defer>
118-
<l:defer.placeholder>
119-
<j:choose>
120-
<j:when test="${attrs.containsKey('placeholder')}">
121-
<j:out value="${attrs.placeholder}" />
122-
</j:when>
123-
<j:otherwise>
124-
<l:skeleton type="form" />
125-
</j:otherwise>
126-
</j:choose>
127-
</l:defer.placeholder>
128-
<l:defer.children>
120+
<j:choose>
121+
<j:when test="${!attrs.noDefer}">
122+
<l:defer>
123+
<l:defer.placeholder>
124+
<j:choose>
125+
<j:when test="${attrs.containsKey('placeholder')}">
126+
<j:out value="${attrs.placeholder}" />
127+
</j:when>
128+
<j:otherwise>
129+
<l:skeleton type="form" />
130+
</j:otherwise>
131+
</j:choose>
132+
</l:defer.placeholder>
133+
<l:defer.children>
134+
<d:invokeBody />
135+
</l:defer.children>
136+
</l:defer>
137+
</j:when>
138+
<j:otherwise>
129139
<d:invokeBody />
130-
</l:defer.children>
131-
</l:defer>
140+
</j:otherwise>
141+
</j:choose>
132142
</div>
133143
</div>
134144
</l:main-panel>

0 commit comments

Comments
 (0)