mirror of
https://github.com/redmine/redmine.git
synced 2026-01-21 06:53:08 +01:00
Merged r21612 to 5.0-stable (35892).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21617 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -71,8 +71,8 @@ module Redmine
|
||||
node = env[:node]
|
||||
return unless node.name == "a" || node.name == "li"
|
||||
return unless node.has_attribute?("id")
|
||||
return if node.name == "a" && node["id"] =~ /\Afnref\d+\z/
|
||||
return if node.name == "li" && node["id"] =~ /\Afn\d+\z/
|
||||
return if node.name == "a" && node["id"] =~ /\Afnref-\d+\z/
|
||||
return if node.name == "li" && node["id"] =~ /\Afn-\d+\z/
|
||||
|
||||
node.remove_attribute("id")
|
||||
}
|
||||
|
||||
@@ -148,10 +148,10 @@ class Redmine::WikiFormatting::CommonMark::FormatterTest < ActionView::TestCase
|
||||
STR
|
||||
|
||||
expected = <<~EXPECTED
|
||||
<p>This is some text<sup><a href="#fn1" id="fnref1">1</a></sup>.</p>
|
||||
<p>This is some text<sup><a href="#fn-1" id="fnref-1">1</a></sup>.</p>
|
||||
<ol>
|
||||
<li id="fn1">
|
||||
<p>This is the foot note <a href="#fnref1">↩</a></p>
|
||||
<li id="fn-1">
|
||||
<p>This is the foot note <a href="#fnref-1" aria-label=\"Back to content\">↩</a></p>
|
||||
</li>
|
||||
</ol>
|
||||
EXPECTED
|
||||
|
||||
Reference in New Issue
Block a user