From 52d215de4386c3c8db1f3435aaf6df4bbdbaab9c Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Wed, 9 Oct 2024 14:04:57 +0000
Subject: [PATCH] Add underline button to CommonMark Markdown toolbar (#40939).

Contributed by Yasu Saku (user:skys).


git-svn-id: https://svn.redmine.org/redmine/trunk@23106 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/assets/javascripts/jstoolbar/common_mark.js        | 10 ++++++++++
 .../wiki_formatting/common_mark/sanitization_filter.rb |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/app/assets/javascripts/jstoolbar/common_mark.js b/app/assets/javascripts/jstoolbar/common_mark.js
index f9e5ba7cd..38467be4b 100644
--- a/app/assets/javascripts/jstoolbar/common_mark.js
+++ b/app/assets/javascripts/jstoolbar/common_mark.js
@@ -26,6 +26,16 @@ jsToolBar.prototype.elements.em = {
   }
 }
 
+// u
+jsToolBar.prototype.elements.ins = {
+  type: 'button',
+  title: 'Underline',
+  shortcut: 'u',
+  fn: {
+    wiki: function() { this.singleTag('<u>', '</u>') }
+  }
+}
+
 // del
 jsToolBar.prototype.elements.del = {
   type: 'button',
diff --git a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
index c689f6d9b..cdefc372b 100644
--- a/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
+++ b/lib/redmine/wiki_formatting/common_mark/sanitization_filter.rb
@@ -111,6 +111,9 @@ module Redmine
             end
           }
 
+          # Allow `u` element to enable underline
+          allowlist[:elements].push('u')
+
           allowlist
         end
       end