Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JENKINS-60866] Clean up build button column JS #5514

Merged
merged 1 commit into from
Jun 14, 2021
Merged

[JENKINS-60866] Clean up build button column JS #5514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,29 +27,22 @@ THE SOFTWARE.
<td>
<j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
<j:set var="id" value="${h.generateId()}"/>
<a href="${jobBaseUrl}${job.shortUrl}build?delay=0sec">
<j:set var="href" value="${jobBaseUrl}${job.shortUrl}build?delay=0sec"/>
<a href="${href}">
<j:choose>
<j:when test="${job.parameterized}">
<j:set var="title" value="${%Schedule_a_task_with_parameters(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
<j:set var="onclick" value="${null}"/>
</j:when>
<j:otherwise>
<span class="build-button-column-icon-reference-holder" data-id="${id}" data-url="${href}" data-notification="${%Task_scheduled(it.taskNoun(job))}"/>
<j:set var="title" value="${%Schedule_a_task(h.getRelativeDisplayNameFrom(job, itemGroup),it.taskNoun(job))}"/>
<j:set var="onclick" value="return build_${id}(this)"/>
</j:otherwise>
</j:choose>
<j:set var="icon" value="${app.queue.contains(job) ? 'icon-clock-anime' : 'icon-clock'}"/>
<l:icon class="${icon} ${subIconSizeClass}"
title="${title}" alt="${title}"
onclick="${onclick}"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like we also need to update

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

Line 30 in af5a649

<l:task href="${url}/build?delay=0sec" icon="icon-clock icon-md" onclick="${it.parameterized?null:'return build_' + id + '(this)'}" permission="${it.BUILD}" post="${!it.parameterized}" title="${it.buildNowText}"/>
though that might require bigger changes

jenkins/core/src/main/resources/lib/layout/task.jelly

Line 153 in af5a649

<j:if test="${attrs.onclick == null and post and not requiresConfirmation}">

title="${title}" alt="${title}" id="${id}" />
<st:adjunct includes="hudson.views.BuildButtonColumn.icon"/>
</a>
<script>
function build_${id}(img) {
new Ajax.Request(img.parentNode.href);
hoverNotification('${%Task_scheduled(it.taskNoun(job))}', img, -100);
return false;
}
</script>
</j:if>
</td>
</j:jelly>
12 changes: 12 additions & 0 deletions core/src/main/resources/hudson/views/BuildButtonColumn/icon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Behaviour.specify(".build-button-column-icon-reference-holder", 'build-button-column', 0, function (e) {
var url = e.getAttribute('data-url');
var message = e.getAttribute('data-notification')
var id = e.getAttribute('data-id');
var icon = document.getElementById(id);

icon.onclick = function(el) {
new Ajax.Request(url);
hoverNotification(message, this, -100);
return false;
}
});
14 changes: 9 additions & 5 deletions core/src/main/resources/lib/layout/icon.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ THE SOFTWARE.
The icon class specification e.g. 'icon-help icon-sm', 'icon-blue icon-md', 'icon-blue-anime icon-xlg'.
</st:attribute>

<st:attribute name="id">
ID of the icon element. Since TODO.
</st:attribute>

<st:attribute name="src">
Icon source raw URL. Only relevant if the 'class' attribute is NOT specified.
</st:attribute>

<st:attribute name="onclick">onclick handler.</st:attribute>
<st:attribute name="onclick" deprecated="true">onclick handler. Deprecated; assign an ID and look up the element that way to attach event handlers.</st:attribute>
<st:attribute name="title">title</st:attribute>
<st:attribute name="style">style</st:attribute>
<st:attribute name="tooltip">tooltip</st:attribute>
Expand Down Expand Up @@ -66,19 +70,19 @@ THE SOFTWARE.

<span class="build-status-icon__wrapper ${attrs.class}" style="${imgStyle}">
<span class="build-status-icon__outer">
<l:svgIcon href="${rootURL}/images/build-status/build-status-sprite.svg#${outerLayer}" />
<l:svgIcon href="${rootURL}/images/build-status/build-status-sprite.svg#${outerLayer}" id="${attrs.id}" />
</span>
<l:svgIcon class="${attrs.class}" href="${iconSrc}"/>
<l:svgIcon class="${attrs.class}" href="${iconSrc}" id="${attrs.id}"/>
</span>
</j:when>

<j:when test="${iconMetadata.svgSprite and !iconMetadata.buildStatus}">
<l:svgIcon class="${attrs.class}" href="${iconSrc}"/>
<l:svgIcon class="${attrs.class}" href="${iconSrc}" id="${attrs.id}"/>
</j:when>

<j:otherwise>
<img class="${attrs.class}" src="${iconSrc}" style="${imgStyle}" title="${attrs.title}" height="${attrs.height}"
alt="${attrs.alt}" width="${attrs.width}" onclick="${attrs.onclick}" tooltip="${attrs.tooltip }"/>
alt="${attrs.alt}" width="${attrs.width}" onclick="${attrs.onclick}" tooltip="${attrs.tooltip}" id="${attrs.id}" />
</j:otherwise>
</j:choose>

Expand Down
7 changes: 6 additions & 1 deletion core/src/main/resources/lib/layout/svgIcon.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
Extra CSS classes passed to the icon. Currently only the 'svg-icon' class is applied by default.
</st:attribute>

<st:attribute name="id">
ID of the icon element. Since TODO.
</st:attribute>

<st:attribute name="href">
Href of the 'use' tag. Normally path to a sprite plus an icon id
</st:attribute>
Expand All @@ -22,7 +26,7 @@
Whether the icon can receive keyboard focus. Possible values 'true' or 'false'
</st:attribute>

<st:attribute name="onclick">onclick handler.</st:attribute>
<st:attribute name="onclick" deprecated="true">onclick handler. Deprecated; assign an ID and look up the element that way to attach event handlers.</st:attribute>
<st:attribute name="style">style</st:attribute>
<st:attribute name="tooltip">tooltip</st:attribute>
<st:attribute name="ariaHidden">aria-hidden</st:attribute>
Expand All @@ -34,6 +38,7 @@
aria-hidden="${attrs.ariaHidden}"
style="${attrs.style}"
onclick="${attrs.onclick}"
id="${attrs.id}"
tooltip="${attrs.tooltip != null ? h.xmlEscape(attrs.tooltip) : null}">

<j:choose>
Expand Down