Removed unnecessary regex in code block plugin

This commit is contained in:
Brandon Mathis 2012-12-26 17:33:48 -06:00
parent c18de55875
commit 55fa9b3d8e

View File

@ -50,7 +50,6 @@ module Jekyll
include HighlightCode include HighlightCode
include TemplateWrapper include TemplateWrapper
CaptionUrlTitle = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i CaptionUrlTitle = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)\s*(.+)?/i
CaptionUrl = /(\S[\S\s]*)\s+(https?:\/\/\S+|\/\S+)/i
Caption = /(\S[\S\s]*)/ Caption = /(\S[\S\s]*)/
def initialize(tag_name, markup, tokens) def initialize(tag_name, markup, tokens)
@title = nil @title = nil
@ -63,10 +62,7 @@ module Jekyll
end end
if markup =~ CaptionUrlTitle if markup =~ CaptionUrlTitle
@file = $1 @file = $1
@caption = "<figcaption><span>#{$1}</span><a href='#{$2}'>#{$3}</a></figcaption>" @caption = "<figcaption><span>#{$1}</span><a href='#{$2}'>#{$3 || 'link'}</a></figcaption>"
elsif markup =~ CaptionUrl
@file = $1
@caption = "<figcaption><span>#{$1}</span><a href='#{$2}'>link</a></figcaption>"
elsif markup =~ Caption elsif markup =~ Caption
@file = $1 @file = $1
@caption = "<figcaption><span>#{$1}</span></figcaption>\n" @caption = "<figcaption><span>#{$1}</span></figcaption>\n"