meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Don't duplicate tags.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14316 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-06-16 18:28:28 +00:00
parent e911ce7cb4
commit 0a8e4b1628
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/redmine/wiki_formatting/markdown/html_parser.rb
View File

@ -20,21 +20,19 @@ module Redmine
module Markdown
class HtmlParser < Redmine::WikiFormatting::HtmlParser
self.tags = {
self.tags = tags.merge(
'b' => {:pre => '**', :post => '**'},
'strong' => {:pre => '**', :post => '**'},
'i' => {:pre => '_', :post => '_'},
'em' => {:pre => '_', :post => '_'},
'strike' => {:pre => '~~', :post => '~~'},
'br' => {:post => "\n"},
'h1' => {:pre => "\n\n# ", :post => "\n\n"},
'h2' => {:pre => "\n\n## ", :post => "\n\n"},
'h3' => {:pre => "\n\n### ", :post => "\n\n"},
'h4' => {:pre => "\n\n#### ", :post => "\n\n"},
'h5' => {:pre => "\n\n##### ", :post => "\n\n"},
'h6' => {:pre => "\n\n###### ", :post => "\n\n"},
'style' => ''
}
'h6' => {:pre => "\n\n###### ", :post => "\n\n"}
)
end
end
end

8
lib/redmine/wiki_formatting/textile/html_parser.rb
View File

@ -20,22 +20,20 @@ module Redmine
module Textile
class HtmlParser < Redmine::WikiFormatting::HtmlParser
self.tags = {
self.tags = tags.merge(
'b' => {:pre => '*', :post => '*'},
'strong' => {:pre => '*', :post => '*'},
'i' => {:pre => '_', :post => '_'},
'em' => {:pre => '_', :post => '_'},
'u' => {:pre => '+', :post => '+'},
'strike' => {:pre => '-', :post => '-'},
'br' => {:post => "\n"},
'h1' => {:pre => "\n\nh1. ", :post => "\n\n"},
'h2' => {:pre => "\n\nh2. ", :post => "\n\n"},
'h3' => {:pre => "\n\nh3. ", :post => "\n\n"},
'h4' => {:pre => "\n\nh4. ", :post => "\n\n"},
'h5' => {:pre => "\n\nh5. ", :post => "\n\n"},
'h6' => {:pre => "\n\nh6. ", :post => "\n\n"},
'style' => ''
}
'h6' => {:pre => "\n\nh6. ", :post => "\n\n"}
)
end
end
end