Skip to content

Commit 1e0fcd1

Browse files
authored
Fix tooltip init after review (#20814)
* Fix tooltip init after review Previous code passed a jQuery collection which initTooltip couldn't handle. Instead, iterate the individial matched elements and add a dollar to the variable name to make it clear it's jQuery. Fixes: #20809
1 parent 82f89ff commit 1e0fcd1

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

web_src/js/features/repo-diff.js

+13-9
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,28 @@ export function initRepoDiffConversationForm() {
4444
$(document).on('submit', '.conversation-holder form', async (e) => {
4545
e.preventDefault();
4646

47-
const form = $(e.target);
48-
const $textArea = form.find('textarea');
47+
const $form = $(e.target);
48+
const $textArea = $form.find('textarea');
4949
if (!validateTextareaNonEmpty($textArea)) {
5050
return;
5151
}
5252

53-
const newConversationHolder = $(await $.post(form.attr('action'), form.serialize()));
54-
const {path, side, idx} = newConversationHolder.data();
53+
const formDataString = String(new URLSearchParams(new FormData($form[0])));
54+
const $newConversationHolder = $(await $.post($form.attr('action'), formDataString));
55+
const {path, side, idx} = $newConversationHolder.data();
5556

56-
initTooltip(newConversationHolder.find('.tooltip'));
57-
form.closest('.conversation-holder').replaceWith(newConversationHolder);
58-
if (form.closest('tr').data('line-type') === 'same') {
57+
$newConversationHolder.find('.tooltip').each(function () {
58+
initTooltip(this);
59+
});
60+
61+
$form.closest('.conversation-holder').replaceWith($newConversationHolder);
62+
if ($form.closest('tr').data('line-type') === 'same') {
5963
$(`[data-path="${path}"] a.add-code-comment[data-idx="${idx}"]`).addClass('invisible');
6064
} else {
6165
$(`[data-path="${path}"] a.add-code-comment[data-side="${side}"][data-idx="${idx}"]`).addClass('invisible');
6266
}
63-
newConversationHolder.find('.dropdown').dropdown();
64-
initCompReactionSelector(newConversationHolder);
67+
$newConversationHolder.find('.dropdown').dropdown();
68+
initCompReactionSelector($newConversationHolder);
6569
});
6670

6771

0 commit comments

Comments
 (0)