Skip to content

Commit f8f477c

Browse files
committed
Implement fundamental Build Now race fix using DOMContentLoaded
1 parent 665e565 commit f8f477c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

core/src/main/resources/lib/hudson/project/configurable.jelly

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ THE SOFTWARE.
2929

3030
<j:if test="${!newJobPage}">
3131
<j:if test="${it.buildable}">
32-
<st:adjunct includes="lib.hudson.project.configurable.configurable"/>
33-
<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}"/>
32+
<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}"/>
3433
</j:if>
3534
<j:choose>
3635
<j:when test="${h.hasPermission(it,it.CONFIGURE)}">

war/src/main/webapp/scripts/behavior.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,15 @@ var Behaviour = (function () {
8181
},
8282

8383
start: function () {
84-
Behaviour.addLoadEvent(function () {
85-
Behaviour.apply();
86-
});
84+
if (document.addEventListener) {
85+
document.addEventListener("DOMContentLoaded", function () {
86+
Behaviour.apply();
87+
});
88+
} else {
89+
Behaviour.addLoadEvent(function () {
90+
Behaviour.apply();
91+
});
92+
}
8793
},
8894

8995
apply: function () {

0 commit comments

Comments
 (0)