From b8fd1561d07a2f7b383aa03390327991d2019450 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 28 Feb 2023 07:13:52 +0800 Subject: [PATCH 1/2] Change button text for commenting and closing an issue at the same time (#23135) Close #10468 Without SimpleMDE/EasyMDE, using Simple Textarea, the button text could be changed when content changes. After introducing SimpleMDE/EasyMDE, there is no code for updating the button text. --- web_src/js/features/comp/EasyMDE.js | 3 +++ web_src/js/features/repo-legacy.js | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/web_src/js/features/comp/EasyMDE.js b/web_src/js/features/comp/EasyMDE.js index 182e6b429df4e..a030db83a36c2 100644 --- a/web_src/js/features/comp/EasyMDE.js +++ b/web_src/js/features/comp/EasyMDE.js @@ -77,6 +77,9 @@ export async function createCommentEasyMDE(textarea, easyMDEOptions = {}) { const inputField = easyMDE.codemirror.getInputField(); + easyMDE.codemirror.on('change', (...args) => { + easyMDEOptions?.onChange(...args); + }); easyMDE.codemirror.setOption('extraKeys', { 'Cmd-Enter': codeMirrorQuickSubmit, 'Ctrl-Enter': codeMirrorQuickSubmit, diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index a9229c0d1e6f5..118475e32e2cf 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -85,12 +85,18 @@ export function initRepoCommentForm() { } (async () => { + const $statusButton = $('#status-button'); for (const textarea of $commentForm.find('textarea:not(.review-textarea, .no-easymde)')) { // Don't initialize EasyMDE for the dormant #edit-content-form if (textarea.closest('#edit-content-form')) { continue; } - const easyMDE = await createCommentEasyMDE(textarea); + const easyMDE = await createCommentEasyMDE(textarea, { + 'onChange': () => { + const value = easyMDE?.value().trim(); + $statusButton.text($statusButton.attr(value.length === 0 ? 'data-status' : 'data-status-and-comment')); + }, + }); initEasyMDEImagePaste(easyMDE, $commentForm.find('.dropzone')); } })(); From 3e6e3a105fe9b88e69ab4f27b6a49a8c5c8b7c6d Mon Sep 17 00:00:00 2001 From: Yarden Shoham Date: Tue, 28 Feb 2023 13:40:48 +0200 Subject: [PATCH 2/2] Update web_src/js/features/comp/EasyMDE.js Co-authored-by: wxiaoguang --- web_src/js/features/comp/EasyMDE.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/comp/EasyMDE.js b/web_src/js/features/comp/EasyMDE.js index a030db83a36c2..2979627b0096a 100644 --- a/web_src/js/features/comp/EasyMDE.js +++ b/web_src/js/features/comp/EasyMDE.js @@ -78,7 +78,7 @@ export async function createCommentEasyMDE(textarea, easyMDEOptions = {}) { const inputField = easyMDE.codemirror.getInputField(); easyMDE.codemirror.on('change', (...args) => { - easyMDEOptions?.onChange(...args); + easyMDEOptions?.onChange?.(...args); }); easyMDE.codemirror.setOption('extraKeys', { 'Cmd-Enter': codeMirrorQuickSubmit,