diff --git a/.prettierignore b/.prettierignore index 72610f04b419..7bdc346011d5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,7 +9,6 @@ node/ # libraries / external deps / generated files src/main/js/plugin-setup-wizard/bootstrap-detached.js -war/src/main/webapp/scripts/yui war/src/main/webapp/jsbundles/ src/main/scss/_bootstrap.scss diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java index 67801475233d..14fdf9d2c7cb 100644 --- a/core/src/main/java/hudson/Functions.java +++ b/core/src/main/java/hudson/Functions.java @@ -662,17 +662,14 @@ public static String validateIconSize(String iconSize) throws SecurityException } /** - * Gets the suffix to use for YUI JavaScript. - */ - public static String getYuiSuffix() { - return DEBUG_YUI ? "debug" : "min"; - } - - /** - * Set to true if you need to use the debug version of YUI. + * No longer used, to be removed after enough plugins have adopted a version of the test harness with + * jenkins-test-harness/pull/874 in it. + * + * @deprecated removed without replacement */ @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console") - public static boolean DEBUG_YUI = SystemProperties.getBoolean("debug.YUI"); + @Deprecated(forRemoval = true, since = "TODO") + public static boolean DEBUG_YUI; /** * Creates a sub map by using the given range (both ends inclusive). diff --git a/core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java b/core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java deleted file mode 100644 index 418f9c4b5406..000000000000 --- a/core/src/main/java/jenkins/model/experimentalflags/RemoveYuiUserExperimentalFlag.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2024, Markus Winter - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -package jenkins.model.experimentalflags; - -import edu.umd.cs.findbugs.annotations.NonNull; -import edu.umd.cs.findbugs.annotations.Nullable; -import hudson.Extension; -import jenkins.util.SystemProperties; -import org.kohsuke.accmod.Restricted; -import org.kohsuke.accmod.restrictions.NoExternalUse; - -@Extension -@Restricted(NoExternalUse.class) -public class RemoveYuiUserExperimentalFlag extends BooleanUserExperimentalFlag { - public RemoveYuiUserExperimentalFlag() { - super("remove-yui.flag"); - } - - @Override - public String getDisplayName() { - return "Remove YUI"; - } - - @Nullable - @Override - public String getShortDescription() { - return "Remove YUI from all Jenkins UI pages. This will break anything that depends on YUI"; - } - - @NonNull - @Override - public Boolean getDefaultValue() { - return SystemProperties.getBoolean(RemoveYuiUserExperimentalFlag.class.getName() + ".defaultValue", true); - } -} diff --git a/core/src/main/resources/lib/form/repeatable/repeatable.js b/core/src/main/resources/lib/form/repeatable/repeatable.js index d985b92d0806..3f19dcfb7e7f 100644 --- a/core/src/main/resources/lib/form/repeatable/repeatable.js +++ b/core/src/main/resources/lib/form/repeatable/repeatable.js @@ -163,7 +163,7 @@ var repeatableSupport = { }; // do the ones that extract innerHTML so that they can get their original HTML before -// other behavior rules change them (like YUI buttons.) +// other behavior rules change them. Behaviour.specify("DIV.repeated-container", "repeatable", -100, function (e) { if (isInsideRemovable(e)) { return; diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly index cbbfa6d9109e..d96e6ead76d2 100644 --- a/core/src/main/resources/lib/layout/layout.jelly +++ b/core/src/main/resources/lib/layout/layout.jelly @@ -128,37 +128,9 @@ THE SOFTWARE. - - - - - - - - - - - - - - - - - - - - - -