Skip to content

Commit

Permalink
[JENKINS-64972] Help-buttons are not working when they are at the top…
Browse files Browse the repository at this point in the history
… of draggable div (jenkinsci#5316)

* [JENKINS-64972] Help-buttons are not working when they are at the top of draggable div

The 'dd-handle' div will make all events in that div (e.g. click event of a button) not triggered, so I move the help-button out of the 'dd-handle' div.
In order to make the button still at the right of the same line, I use flex to realize.

* [JENKINS-64972] Move style to CSS file
  • Loading branch information
benebsiny committed Mar 4, 2021
1 parent 62fdb42 commit 7be7079
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/form/hetero-list.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ THE SOFTWARE.
<div colspan="3">
<div class="${attrs.disableDragAndDrop or readOnlyMode ? '' : 'dd-handle'}">
<b>${descriptor.displayName}</b>
<f:helpLink url="${help}"/>
</div>
<f:helpLink url="${help}"/>
</div>
</div>
<!-- TODO: help support is unintuitive; people should be able to see help from drop-down menu -->
Expand Down
8 changes: 8 additions & 0 deletions war/src/main/less/base/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -1280,6 +1280,14 @@ textarea.rich-editor {

/* ========================= D&D support in heterogenous/repeatable lists = */

.hetero-list-container .has-help {
display: flex;
}

.hetero-list-container .has-help .dd-handle {
flex: 1;
}

.hetero-list-container .dd-handle,
.repeated-container .dd-handle {
cursor: move;
Expand Down

0 comments on commit 7be7079

Please sign in to comment.