Merge remote-tracking branch 'upstream/pull/5842'

diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js
index e8fcca3021df7cee96200d59ee47b26a07bbfa86..f0b7dae273d9b02a0ac812d36125b4dd2bbe5fd5 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -41,8 +41,11 @@ OSM.Note = function (map) {
             data = new URLSearchParams();
       content.find("button[name]").prop("disabled", true);
 
-      if (name !== "subscribe" && name !== "unsubscribe" && name !== "reopen") {
-        data.set("text", content.find("textarea").val());
+      if (name !== "subscribe" && name !== "unsubscribe") {
+        const textarea = content.find("textarea");
+        if (textarea.length) {
+          data.set("text", textarea.val());
+        }
       }
 
       fetch(url, {

diff --git a/test/system/resolve_note_test.rb b/test/system/resolve_note_test.rb
index f9c28a999b07ac120f4518720f77dedfb73244c6..c4b02b0405b89a418a9e263546cd74dbab6f5d7a 100644 (file)
--- a/test/system/resolve_note_test.rb
+++ b/test/system/resolve_note_test.rb
@@ -86,6 +86,7 @@ class ResolveNoteTest < ApplicationSystemTestCase
 
       assert_content "Hidden note ##{note.id}"
       assert_no_content "<iframe" # leak from share textarea
+      assert_no_content "undefined" # value from missing comment textarea
     end
   end