fix markup on framed absolute image urls
This commit is contained in:
@@ -200,7 +200,7 @@ module Gollum
|
|||||||
classes << 'frame' if opts['frame']
|
classes << 'frame' if opts['frame']
|
||||||
%{<span class="#{classes.join(' ')}">} +
|
%{<span class="#{classes.join(' ')}">} +
|
||||||
%{<span>} +
|
%{<span>} +
|
||||||
%{<img src="/#{file.path}" #{attr_string}/>} +
|
%{<img src="#{path}" #{attr_string}/>} +
|
||||||
(alt ? %{<span>#{alt}</span>} : '') +
|
(alt ? %{<span>#{alt}</span>} : '') +
|
||||||
%{</span>} +
|
%{</span>} +
|
||||||
%{</span>}
|
%{</span>}
|
||||||
|
|||||||
@@ -205,6 +205,12 @@ context "Markup" do
|
|||||||
relative_image(content, output)
|
relative_image(content, output)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "absolute image with frame" do
|
||||||
|
content = "a\n\n[[http://example.com/bilbo.jpg|frame]]\n\nb"
|
||||||
|
output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"http://example.com/bilbo.jpg\" /></span></span></p>\n\n<p>b</p>"
|
||||||
|
relative_image(content, output)
|
||||||
|
end
|
||||||
|
|
||||||
test "image with frame and alt" do
|
test "image with frame and alt" do
|
||||||
content = "a\n\n[[alpha.jpg|frame|alt=Alpha]]\n\nb"
|
content = "a\n\n[[alpha.jpg|frame|alt=Alpha]]\n\nb"
|
||||||
output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"/greek/alpha.jpg\" alt=\"Alpha\" /><span>Alpha</span></span></span></p>\n\n<p>b</p>"
|
output = "<p>a</p>\n\n<p><span class=\"frame\"><span><img src=\"/greek/alpha.jpg\" alt=\"Alpha\" /><span>Alpha</span></span></span></p>\n\n<p>b</p>"
|
||||||
|
|||||||
Reference in New Issue
Block a user