diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-06-16 10:56:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2018-06-16 10:56:52 +0000 |
| commit | 794a2a0180ed2d2801be4146ac59799747683b3d (patch) | |
| tree | a1ff2422558cab4e349b65b5aa3eee21dba3e942 /lib | |
| parent | baab521b8ba0d82fcbf0528d867651813ff34169 (diff) | |
| download | redmine-794a2a0180ed2d2801be4146ac59799747683b3d.tar.gz redmine-794a2a0180ed2d2801be4146ac59799747683b3d.zip | |
Enable and add underline button to the toolbar for Markdown formatting (#28169).
Patch by Marius BALTEANU.
git-svn-id: http://svn.redmine.org/redmine/trunk@17385 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/wiki_formatting/markdown/formatter.rb | 3 | ||||
| -rw-r--r-- | lib/redmine/wiki_formatting/markdown/html_parser.rb | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb index c7611d977..b5ee2c941 100644 --- a/lib/redmine/wiki_formatting/markdown/formatter.rb +++ b/lib/redmine/wiki_formatting/markdown/formatter.rb @@ -141,7 +141,8 @@ module Redmine :superscript => true, :no_intra_emphasis => true, :footnotes => true, - :lax_spacing => true + :lax_spacing => true, + :underline => true ) end end diff --git a/lib/redmine/wiki_formatting/markdown/html_parser.rb b/lib/redmine/wiki_formatting/markdown/html_parser.rb index cee3a2f07..f34034093 100644 --- a/lib/redmine/wiki_formatting/markdown/html_parser.rb +++ b/lib/redmine/wiki_formatting/markdown/html_parser.rb @@ -23,8 +23,9 @@ module Redmine self.tags = tags.merge( 'b' => {:pre => '**', :post => '**'}, 'strong' => {:pre => '**', :post => '**'}, - 'i' => {:pre => '_', :post => '_'}, - 'em' => {:pre => '_', :post => '_'}, + 'i' => {:pre => '*', :post => '*'}, + 'em' => {:pre => '*', :post => '*'}, + 'u' => {:pre => '_', :post => '_'}, 'strike' => {:pre => '~~', :post => '~~'}, 'h1' => {:pre => "\n\n# ", :post => "\n\n"}, 'h2' => {:pre => "\n\n## ", :post => "\n\n"}, |