From b4bb3b99f920efe0c2d5d42a69b0c09a8fd9f602 Mon Sep 17 00:00:00 2001
From: Andrew Thornton <art27@cantab.net>
Date: Wed, 5 May 2021 17:44:47 +0100
Subject: [PATCH 1/2] Fix close button change on delete in simplemde area

Fix issue with close button changing when deleting in the simplemde textarea.

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 web_src/js/index.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web_src/js/index.js b/web_src/js/index.js
index 89cc0aa11c13a..816e643d89f22 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -1184,6 +1184,12 @@ async function initRepository() {
     // Change status
     const $statusButton = $('#status-button');
     $('#comment-form textarea').on('keyup', function () {
+      const $simplemde = $(this).data('simplemde');
+      if ($simplemde && $simplemde.value().length !== 0) {
+        $statusButton.text($statusButton.data('status-and-comment'));
+        return;
+      }
+
       if ($(this).val().length === 0) {
         $statusButton.text($statusButton.data('status'));
       } else {
@@ -1698,6 +1704,8 @@ function setCommentSimpleMDE($editArea) {
     }
   });
   attachTribute(simplemde.codemirror.getInputField(), {mentions: true, emoji: true});
+  $editArea.data('simplemde', simplemde);
+  $(simplemde.codemirror.getInputField()).data('simplemde', simplemde);
   return simplemde;
 }
 

From 7fbedd269d8586c64cd7077f3454cb7c7579ceca Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 5 May 2021 20:56:49 +0200
Subject: [PATCH 2/2] apply suggestion

---
 web_src/js/index.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/web_src/js/index.js b/web_src/js/index.js
index 816e643d89f22..2fce21b8d3c35 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -1185,16 +1185,8 @@ async function initRepository() {
     const $statusButton = $('#status-button');
     $('#comment-form textarea').on('keyup', function () {
       const $simplemde = $(this).data('simplemde');
-      if ($simplemde && $simplemde.value().length !== 0) {
-        $statusButton.text($statusButton.data('status-and-comment'));
-        return;
-      }
-
-      if ($(this).val().length === 0) {
-        $statusButton.text($statusButton.data('status'));
-      } else {
-        $statusButton.text($statusButton.data('status-and-comment'));
-      }
+      const value = ($simplemde && $simplemde.value()) ? $simplemde.value() : $(this).val();
+      $statusButton.text($statusButton.data(value.length === 0 ? 'status' : 'status-and-comment'));
     });
     $statusButton.on('click', () => {
       $('#status').val($statusButton.data('status-val'));