##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r15442 (#22898)....
Jean-Philippe Lang -
r15062:cdfebdcec8d9
parent child
Show More
Side by Side Unified
Context file:
r15062:cdfebdcec8d9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -973,7 +973,7 class RedCloth3 < String
973 if stln == "<p>"
973 if stln == "<p>"
974 out = "<p style=\"float:#{ algn }\">#{ out }"
974 out = "<p style=\"float:#{ algn }\">#{ out }"
975 else
975 else
976 out = "#{ stln }<div style=\"float:#{ algn }\">#{ out }</div>"
976 out = "#{ stln }<span style=\"float:#{ algn }\">#{ out }</span>"
977 end
977 end
978 else
978 else
979 out = stln + out
979 out = stln + out
Show file before | Show file after | Hide comments
@@ -116,7 +116,7 class ApplicationHelperTest < ActionView::TestCase
116 def test_inline_images
116 def test_inline_images
117 to_test = {
117 to_test = {
118 '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
118 '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
119 'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
119 'floating !>http://foo.bar/image.jpg!' => 'floating <span style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></span>',
120 'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
120 'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
121 '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="" />',
121 '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="" />',
122 '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" />',
122 '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" />',
General Comments 0
You need to be logged in to leave comments. Login now