Implement fundamental Build Now race fix using DOMContentLoaded

LakshyaBagani · LakshyaBagani · commit f05a46ca2624 · 2026-01-22T03:01:16.000+05:30
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
@@ -448,6 +448,15 @@ public static boolean useHidingPasswordFields() {
         return SystemProperties.getBoolean(Functions.class.getName() + ".hidingPasswordFields", true);
     }
 
+    /**
+     * Toggles whether to use the DOMContentLoaded event instead of window.onload for behavior script initialization.
+     * @since TODO
+     */
+    @Restricted(NoExternalUse.class)
+    public static boolean getUseDOMContentLoaded() {
+        return SystemProperties.getBoolean(Functions.class.getName() + ".useDOMContentLoaded", true);
+    }
+
     /**
      * URL decomposed for easier computation of relevant URLs.
      *
diff --git a/core/src/main/resources/lib/hudson/project/configurable.jelly b/core/src/main/resources/lib/hudson/project/configurable.jelly
@@ -29,8 +29,7 @@ THE SOFTWARE.
 
     <j:if test="${!newJobPage}">
       <j:if test="${it.buildable}">
-        <st:adjunct includes="lib.hudson.project.configurable.configurable"/>
-        <l:task href="${url}/build?delay=0sec" icon="icon-clock icon-md" permission="${it.BUILD}" post="${!it.parameterized}" data-callback="lib_hudson_project_configurable_build_now_callback" data-build-failure="${%buildFailed}" data-build-success="${%Build scheduled}" data-parameterized="${it.parameterized}" title="${it.buildNowText}"/>
+        <l:task href="${url}/build?delay=0sec" icon="icon-clock icon-md" permission="${it.BUILD}" post="${!it.parameterized}" data-task-failure="${%buildFailed}" data-task-success="${%Build scheduled}" title="${it.buildNowText}"/>
       </j:if>
       <j:choose>
         <j:when test="${h.hasPermission(it,it.CONFIGURE)}">
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
@@ -105,7 +105,8 @@ THE SOFTWARE.
   <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}"
         data-extensions-available="${extensionsAvailable}"
         data-crumb-header="${h.getCrumbRequestField()}" data-crumb-value="${h.getCrumb(request2)}"
-        data-unit-test="${h.isUnitTest}">
+        data-unit-test="${h.isUnitTest}"
+        data-use-dom-content-loaded="${h.getUseDOMContentLoaded()}">
     ${h.checkPermission(it,permission)}
     ${h.checkAnyPermission(it, permissions)}
 
diff --git a/war/src/main/webapp/scripts/behavior.js b/war/src/main/webapp/scripts/behavior.js
@@ -81,9 +81,17 @@ var Behaviour = (function () {
     },
 
     start: function () {
-      Behaviour.addLoadEvent(function () {
-        Behaviour.apply();
-      });
+      var useDOMContentLoaded =
+        document.head.getAttribute("data-use-dom-content-loaded") === "true";
+      if (useDOMContentLoaded && document.addEventListener) {
+        document.addEventListener("DOMContentLoaded", function () {
+          Behaviour.apply();
+        });
+      } else {
+        Behaviour.addLoadEvent(function () {
+          Behaviour.apply();
+        });
+      }
     },
 
     apply: function () {
