kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed: inline images in wiki headings (#4112). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2999 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2009-11-04 10:22:57 +00:00
parent 03548f2d63
commit 9943f64ff0
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redcloth3.rb
View File

@ -912,7 +912,7 @@ class RedCloth3 < String
end end
IMAGE_RE = / IMAGE_RE = /
(<p>|\s|^) # start of line? (>|\s|^) # start of line?
\! # opening \! # opening
(\<|\=|\>)? # optional alignment atts (\<|\=|\>)? # optional alignment atts
(#{C}) # optional style,class atts (#{C}) # optional style,class atts

13
test/unit/helpers/application_helper_test.rb
View File

@ -81,6 +81,19 @@ class ApplicationHelperTest < HelperTestCase
to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) } to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
end end
def test_inline_images_inside_tags
raw = <<-RAW
h1. !foo.png! Heading
Centered image:
p=. !bar.gif!
RAW
assert textilizable(raw).include?('<img src="foo.png" alt="" />')
assert textilizable(raw).include?('<img src="bar.gif" alt="" />')
end
def test_acronyms def test_acronyms
to_test = { to_test = {
'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>', 'this is an acronym: GPL(General Public License)' => 'this is an acronym: <acronym title="General Public License">GPL</acronym>',