Fixed a bug where blockquotes broke without an author, also refactored a bit for reability

This commit is contained in:
Brandon Mathis 2011-07-19 16:32:57 -04:00
parent 98cfd74d9a
commit a71a709cb3

View File

@ -41,8 +41,8 @@ module Jekyll
end end
def render(context) def render(context)
output = paragraphize(super.map(&:strip).join) quote = paragraphize(super.map(&:strip).join)
author = "<strong>#{@by.strip}</strong>" author = "<strong>#{@by.strip}</strong>" if @by
if @source if @source
url = @source.match(/https?:\/\/(.+)/)[1].split('/') url = @source.match(/https?:\/\/(.+)/)[1].split('/')
parts = [] parts = []
@ -55,14 +55,14 @@ module Jekyll
source << '/&hellip;' unless source == @source source << '/&hellip;' unless source == @source
end end
cite = "<cite><a href='#{@source}'>#{(@title || source)}</a></cite>" cite = "<cite><a href='#{@source}'>#{(@title || source)}</a></cite>"
result = if @by.nil? quote_only = if @by.nil?
output quote
elsif !@source.nil? elsif !@source.nil?
"#{output}<footer>#{author + cite}</footer>" "#{quote}<footer>#{author + cite}</footer>"
else else
"#{output}<footer>#{author}</footer>" "#{quote}<footer>#{author}</footer>"
end end
"<blockquote>#{result}</blockquote>" "<blockquote>#{quote_only}</blockquote>"
end end
def paragraphize(input) def paragraphize(input)