Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-10 15:26:03 +01:00
Code Issues Packages Projects Releases Activity

Fix HTML generated for floating images in paragraphs (#22898).

Browse Source 
Patch by Gregor Schmidt.

git-svn-id: http://svn.redmine.org/redmine/trunk@15442 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2016-06-04 07:31:29 +00:00
parent 91e991e951
commit f20f49a76b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redcloth3.rb
View File

@@ -973,7 +973,7 @@ class RedCloth3 < String
if stln == "<p>" if stln == "<p>"
out = "<p style=\"float:#{ algn }\">#{ out }" out = "<p style=\"float:#{ algn }\">#{ out }"
else else
out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>" out = "#{ stln }<span style=\"float:#{ algn }\">#{ out }</span>"
end end
else else
out = stln + out out = stln + out

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

@@ -116,7 +116,7 @@ class ApplicationHelperTest < ActionView::TestCase
def test_inline_images def test_inline_images
to_test = { to_test = {
'!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />', '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>', 'floating !>http://foo.bar/image.jpg!' => 'floating <span style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></span>',
'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />', 'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
'with style !{width:100px;height:100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height:100px;" alt="" />', 'with style !{width:100px;height:100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height:100px;" alt="" />',
'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />', 'with title !http://foo.bar/image.jpg(This is a title)!' => 'with title <img src="http://foo.bar/image.jpg" title="This is a title" alt="This is a title" />',