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

Make issue meta dropdown support Enter, confirm before reloading #23014

Merged
merged 9 commits into from
Feb 24, 2023
Merged

Make issue meta dropdown support Enter, confirm before reloading #23014

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8a4382b
improve
wxiaoguang Feb 20, 2023
649fa2d
Update web_src/js/features/repo-legacy.js
wxiaoguang Feb 20, 2023
8668a88
fix comment actions and menus
wxiaoguang Feb 21, 2023
6d1c734
Merge branch 'main' into improve-label-dropdown
wxiaoguang Feb 22, 2023
1bd96d3
do not reload window when there is no change
wxiaoguang Feb 22, 2023
d263120
reloadConfirmDraftComment
wxiaoguang Feb 22, 2023
ec0919e
Merge branch 'main' into improve-label-dropdown
wxiaoguang Feb 22, 2023
afef2c4
Update repo-legacy.js
wxiaoguang Feb 23, 2023
1f94a46
Merge branch 'main' into improve-label-dropdown
lunny Feb 24, 2023
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
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content/sidebar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_labels"}}">
</div>
{{end}}
<div class="no-select item">{{.locale.Tr "repo.issues.new.clear_labels"}}</div>
<a class="no-select item" href="#">{{.locale.Tr "repo.issues.new.clear_labels"}}</a>
{{if or .Labels .OrgLabels}}
{{$previousExclusiveScope := "_no_scope"}}
{{range .Labels}}
Expand Down
3 changes: 2 additions & 1 deletion web_src/js/features/aria.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ function attachOneDropdownAria($dropdown) {
$dropdown.on('keydown', (e) => {
// here it must use keydown event before dropdown's keyup handler, otherwise there is no Enter event in our keyup handler
if (e.key === 'Enter') {
const $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value'));
let $item = $dropdown.dropdown('get item', $dropdown.dropdown('get value'));
if (!$item) $item = $menu.find('> .item.selected'); // when dropdown filters items by input, there is no "value", so query the "selected" item
// if the selected item is clickable, then trigger the click event. in the future there could be a special CSS class for it.
if ($item && $item.is('a')) $item[0].click();
}
Expand Down
15 changes: 8 additions & 7 deletions web_src/js/features/repo-legacy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,12 @@ export function initRepoCommentForm() {
let hasUpdateAction = $listMenu.data('action') === 'update';
const items = {};

$(`.${selector}`).dropdown('setting', 'onHide', () => {
hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var
if (hasUpdateAction) {
// TODO: Add batch functionality and make this 1 network request.
(async function() {
$(`.${selector}`).dropdown({
'action': 'nothing', // do not hide the menu if user presses Enter
wxiaoguang marked this conversation as resolved.
Show resolved Hide resolved
async onHide() {
hasUpdateAction = $listMenu.data('action') === 'update'; // Update the var
if (hasUpdateAction) {
// TODO: Add batch functionality and make this 1 network request.
for (const [elementId, item] of Object.entries(items)) {
await updateIssuesMeta(
item['update-url'],
Expand All @@ -100,8 +101,8 @@ export function initRepoCommentForm() {
);
}
window.location.reload();
})();
}
}
},
});

$listMenu.find('.item:not(.no-select)').on('click', function (e) {
Expand Down