Skip to content

Commit c06f1dc

Browse files
timjatimja
committed
Remove YUI
1 parent 986f631 commit c06f1dc

File tree

206 files changed

+12
-85029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+12
-85029
lines changed

‎.prettierignore

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ node/
99

1010
# libraries / external deps / generated files
1111
src/main/js/plugin-setup-wizard/bootstrap-detached.js
12-
war/src/main/webapp/scripts/yui
1312
war/src/main/webapp/jsbundles/
1413
src/main/scss/_bootstrap.scss
1514

‎core/src/main/java/hudson/Functions.java

+3-8
Original file line numberDiff line numberDiff line change
@@ -662,18 +662,13 @@ public static String validateIconSize(String iconSize) throws SecurityException
662662
}
663663

664664
/**
665-
* Gets the suffix to use for YUI JavaScript.
665+
* @deprecated yui has been removed, do not call this
666666
*/
667+
@Deprecated(forRemoval = true, since = "TODO")
667668
public static String getYuiSuffix() {
668-
return DEBUG_YUI ? "debug" : "min";
669+
return "min";
669670
}
670671

671-
/**
672-
* Set to true if you need to use the debug version of YUI.
673-
*/
674-
@SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
675-
public static boolean DEBUG_YUI = SystemProperties.getBoolean("debug.YUI");
676-
677672
/**
678673
* Creates a sub map by using the given range (both ends inclusive).
679674
*/

‎core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java

-57
This file was deleted.

‎core/src/main/resources/lib/form/repeatable/repeatable.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ var repeatableSupport = {
163163
};
164164

165165
// do the ones that extract innerHTML so that they can get their original HTML before
166-
// other behavior rules change them (like YUI buttons.)
166+
// other behavior rules change them.
167167
Behaviour.specify("DIV.repeated-container", "repeatable", -100, function (e) {
168168
if (isInsideRemovable(e)) {
169169
return;

‎core/src/main/resources/lib/layout/layout.jelly

+1-29
Original file line numberDiff line numberDiff line change
@@ -128,37 +128,9 @@ THE SOFTWARE.
128128

129129
<st:adjunct includes="org.kohsuke.stapler.bind"/>
130130

131-
<l:userExperimentalFlag var="removeYUI" flagClassName="jenkins.model.experimentalflags.RemoveYuiUserExperimentalFlag" />
132-
<j:if test="${!removeYUI}">
133-
<!-- To use the debug version of YUI, set the system property 'debug.YUI' to true -->
134-
<j:set var="yuiSuffix" value="${h.yuiSuffix}" />
135-
<l:yui module="yahoo" />
136-
<l:yui module="dom" />
137-
<l:yui module="event" />
138-
<j:if test="${h.yuiSuffix=='debug'}">
139-
<l:yui module="logger" />
140-
</j:if>
141-
<l:yui module="animation" />
142-
<l:yui module="dragdrop" />
143-
<l:yui module="container" />
144-
<l:yui module="connection" />
145-
<l:yui module="datasource" />
146-
<l:yui module="autocomplete" />
147-
<l:yui module="menu" />
148-
<l:yui module="element" />
149-
<l:yui module="button" />
150-
<l:yui module="storage" />
151-
</j:if>
152-
153131
<script src="${resURL}/scripts/hudson-behavior.js" type="text/javascript"></script>
154132
<script src="${resURL}/scripts/sortable.js" type="text/javascript"/>
155133

156-
<j:if test="${!removeYUI}">
157-
<link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/container.css" type="text/css"/>
158-
<link rel="stylesheet" href="${resURL}/scripts/yui/container/assets/skins/sam/container.css" type="text/css"/>
159-
<link rel="stylesheet" href="${resURL}/scripts/yui/menu/assets/skins/sam/menu.css" type="text/css" />
160-
</j:if>
161-
162134
<l:hasPermission permission="${app.READ}">
163135
<link rel="search" type="application/opensearchdescription+xml" href="${rootURL}/opensearch.xml" title="Jenkins" />
164136
</l:hasPermission>
@@ -178,7 +150,7 @@ THE SOFTWARE.
178150
<script src="${resURL}/jsbundles/sortable-drag-drop.js" type="text/javascript"/>
179151
<script src="${resURL}/jsbundles/app.js" type="text/javascript" defer="true" />
180152
</head>
181-
<body id="jenkins" class="${removeYUI ? '' : 'yui-skin-sam'} ${layoutType} jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}">
153+
<body id="jenkins" class="${layoutType} jenkins-${h.version}" data-version="${h.version}" data-model-type="${it.class.name}">
182154
<l:command-palette />
183155

184156
<j:if test="${layoutType!='full-screen'}">

‎core/src/main/resources/lib/layout/side-panel.jelly

+1-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ THE SOFTWARE.
3535

3636
<j:if test="${mode=='side-panel'}">
3737
<div id="side-panel" class="app-page-body__sidebar ${attrs.sticky == 'true' ? 'app-page-body__sidebar--sticky' : ''}">
38-
<d:invokeBody />
39-
<!-- add YUI logger if debugging YUI -->
40-
<j:if test="${h.yuiSuffix=='debug'}">
41-
<!-- script to transform this into the Logger Console is done in hudson-behavior.js -->
42-
<div id="yui-logreader" style="margin-top:1em"/>
43-
</j:if>
38+
<d:invokeBody />
4439
</div>
4540
</j:if>
4641

‎core/src/main/resources/lib/layout/yui.jelly

+3-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,9 @@ THE SOFTWARE.
2525
<?jelly escape-by-default='true'?>
2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
2727
<st:documentation>
28-
Load Yahoo UI module.
29-
<st:attribute name="module" use="required">
30-
YUI module name to load.
28+
Remove this tag, YUI has been removed from Jenkins
29+
<st:attribute name="module" deprecated="true">
30+
Remove this tag, YUI has been removed from Jenkins
3131
</st:attribute>
3232
</st:documentation>
33-
<!--
34-
We used to take @suffix as '-beta' to loa beta modules, but as of YUI 2.9 there's no beta module.
35-
I don't think YUI2 will get new beta modules in the future, but if we do, we need to compute them
36-
from the module name, since older plugins specify suffix="-beta" for modules that have graduated
37-
beta since then.
38-
-->
39-
<script src="${resURL}/scripts/yui/${module}/${module}-${yuiSuffix}.js" />
4033
</j:jelly>

‎eslint.config.cjs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ module.exports = [
1919
".pnp.cjs",
2020
".pnp.loader.mjs",
2121
"src/main/js/plugin-setup-wizard/bootstrap-detached.js",
22-
"war/src/main/webapp/scripts/yui/*",
2322
],
2423
},
2524
{

‎src/main/scss/base/_index.scss

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
@use "style";
77
@use "typography";
88
@use "visibility-utils";
9-
@use "yui-compatibility";

‎src/main/scss/base/_style.scss

-17
Original file line numberDiff line numberDiff line change
@@ -729,23 +729,6 @@ table.progress-bar.red td.progress-bar-done {
729729
}
730730
}
731731

732-
/* ========================= YUI dialog ========================= */
733-
734-
/* discovered this margin fix by a trial and error. This can very well be a totally wrong fix, or perhaps updating
735-
to the latest YUI will fix this? */
736-
.dialog .hd {
737-
margin: 0 !important;
738-
font-size: var(--font-size-xs) !important;
739-
}
740-
741-
.dialog .bd {
742-
margin: 0 !important;
743-
}
744-
745-
.dialog .ft {
746-
margin: 0 !important;
747-
}
748-
749732
/* ========================= tags/labels ================== */
750733
// Used in core/src/main/java/hudson/util/TagCloud.java#getClassName
751734

0 commit comments

Comments
 (0)