mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-25 21:44:20 -04:00
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
@ -901,25 +901,23 @@ async function initRepository() {
|
|||||||
const target = $(this).data('target');
|
const target = $(this).data('target');
|
||||||
const quote = $(`#comment-${target}`).text().replace(/\n/g, '\n> ');
|
const quote = $(`#comment-${target}`).text().replace(/\n/g, '\n> ');
|
||||||
const content = `> ${quote}\n\n`;
|
const content = `> ${quote}\n\n`;
|
||||||
|
let $simplemde = autoSimpleMDE;
|
||||||
let $content;
|
|
||||||
if ($(this).hasClass('quote-reply-diff')) {
|
if ($(this).hasClass('quote-reply-diff')) {
|
||||||
const $parent = $(this).closest('.comment-code-cloud');
|
const $parent = $(this).closest('.comment-code-cloud');
|
||||||
$parent.find('button.comment-form-reply').trigger('click');
|
$parent.find('button.comment-form-reply').trigger('click');
|
||||||
$content = $parent.find('[name="content"]');
|
$simplemde = $parent.find('[name="content"]').data('simplemde');
|
||||||
if ($content.val() !== '') {
|
}
|
||||||
$content.val(`${$content.val()}\n\n${content}`);
|
if ($simplemde !== null) {
|
||||||
|
if ($simplemde.value() !== '') {
|
||||||
|
$simplemde.value(`${$simplemde.value()}\n\n${content}`);
|
||||||
} else {
|
} else {
|
||||||
$content.val(`${content}`);
|
$simplemde.value(`${content}`);
|
||||||
}
|
|
||||||
$content.focus();
|
|
||||||
} else if (autoSimpleMDE !== null) {
|
|
||||||
if (autoSimpleMDE.value() !== '') {
|
|
||||||
autoSimpleMDE.value(`${autoSimpleMDE.value()}\n\n${content}`);
|
|
||||||
} else {
|
|
||||||
autoSimpleMDE.value(`${content}`);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
$simplemde.codemirror.focus();
|
||||||
|
$simplemde.codemirror.setCursor($simplemde.codemirror.lineCount(), 0);
|
||||||
|
});
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -1082,8 +1080,10 @@ async function initRepository() {
|
|||||||
$textarea.val($rawContent.text());
|
$textarea.val($rawContent.text());
|
||||||
$simplemde.value($rawContent.text());
|
$simplemde.value($rawContent.text());
|
||||||
}
|
}
|
||||||
$textarea.focus();
|
requestAnimationFrame(() => {
|
||||||
$simplemde.codemirror.focus();
|
$textarea.focus();
|
||||||
|
$simplemde.codemirror.focus();
|
||||||
|
});
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user