Fix Quote Reply button on review diff (#13830)
* Fix Quote Reply #13762 * requestAnimationFrame() instead of setTimeout() Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
6bdcacd73b
commit
4d66ee1f74
1 changed files with 15 additions and 15 deletions
|
@ -901,25 +901,23 @@ async function initRepository() {
|
|||
const target = $(this).data('target');
|
||||
const quote = $(`#comment-${target}`).text().replace(/\n/g, '\n> ');
|
||||
const content = `> ${quote}\n\n`;
|
||||
|
||||
let $content;
|
||||
let $simplemde = autoSimpleMDE;
|
||||
if ($(this).hasClass('quote-reply-diff')) {
|
||||
const $parent = $(this).closest('.comment-code-cloud');
|
||||
$parent.find('button.comment-form-reply').trigger('click');
|
||||
$content = $parent.find('[name="content"]');
|
||||
if ($content.val() !== '') {
|
||||
$content.val(`${$content.val()}\n\n${content}`);
|
||||
$simplemde = $parent.find('[name="content"]').data('simplemde');
|
||||
}
|
||||
if ($simplemde !== null) {
|
||||
if ($simplemde.value() !== '') {
|
||||
$simplemde.value(`${$simplemde.value()}\n\n${content}`);
|
||||
} else {
|
||||
$content.val(`${content}`);
|
||||
}
|
||||
$content.focus();
|
||||
} else if (autoSimpleMDE !== null) {
|
||||
if (autoSimpleMDE.value() !== '') {
|
||||
autoSimpleMDE.value(`${autoSimpleMDE.value()}\n\n${content}`);
|
||||
} else {
|
||||
autoSimpleMDE.value(`${content}`);
|
||||
$simplemde.value(`${content}`);
|
||||
}
|
||||
}
|
||||
requestAnimationFrame(() => {
|
||||
$simplemde.codemirror.focus();
|
||||
$simplemde.codemirror.setCursor($simplemde.codemirror.lineCount(), 0);
|
||||
});
|
||||
event.preventDefault();
|
||||
});
|
||||
|
||||
|
@ -1082,8 +1080,10 @@ async function initRepository() {
|
|||
$textarea.val($rawContent.text());
|
||||
$simplemde.value($rawContent.text());
|
||||
}
|
||||
$textarea.focus();
|
||||
$simplemde.codemirror.focus();
|
||||
requestAnimationFrame(() => {
|
||||
$textarea.focus();
|
||||
$simplemde.codemirror.focus();
|
||||
});
|
||||
event.preventDefault();
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue