dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2097 from jekyll/listen-2.5

This commit is contained in:
Parker Moore 2014-02-24 18:56:04 -05:00
parent 2988bb6a32 d7598ee9d2
commit aa9500434b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jekyll.gemspec
View File

@ -30,7 +30,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('liquid', "~> 2.5.5") s.add_runtime_dependency('liquid', "~> 2.5.5")
s.add_runtime_dependency('classifier', "~> 1.3") s.add_runtime_dependency('classifier', "~> 1.3")
s.add_runtime_dependency('listen', "~> 1.3") s.add_runtime_dependency('listen', "~> 2.5")
s.add_runtime_dependency('maruku', "0.7.0") s.add_runtime_dependency('maruku', "0.7.0")
s.add_runtime_dependency('pygments.rb', "~> 0.5.0") s.add_runtime_dependency('pygments.rb', "~> 0.5.0")
s.add_runtime_dependency('mercenary', "~> 0.3.1") s.add_runtime_dependency('mercenary', "~> 0.3.1")

2
lib/jekyll/commands/build.rb
View File

@ -48,7 +48,7 @@ module Jekyll
Jekyll.logger.info "Auto-regeneration:", "enabled" Jekyll.logger.info "Auto-regeneration:", "enabled"
listener = Listen::Listener.new(source, :ignore => ignored) do |modified, added, removed| listener = Listen.to(source, :ignore => ignored) do |modified, added, removed|
t = Time.now.strftime("%Y-%m-%d %H:%M:%S") t = Time.now.strftime("%Y-%m-%d %H:%M:%S")
n = modified.length + added.length + removed.length n = modified.length + added.length + removed.length
print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} " print Jekyll.logger.formatted_topic("Regenerating:") + "#{n} files at #{t} "

1
lib/jekyll/converters/markdown/redcarpet_parser.rb
View File

@ -5,6 +5,7 @@ module Jekyll
module CommonMethods module CommonMethods
def add_code_tags(code, lang) def add_code_tags(code, lang)
code = code.to_s
code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\" data-lang=\"#{lang}\">") code = code.sub(/<pre>/, "<pre><code class=\"#{lang} language-#{lang}\" data-lang=\"#{lang}\">")
code = code.sub(/<\/pre>/,"</code></pre>") code = code.sub(/<\/pre>/,"</code></pre>")
end end