Homagah it all renders I think.

This commit is contained in:
Parker Moore
2014-04-02 17:17:55 -04:00
parent a15a584136
commit 37a7236e20
6 changed files with 33 additions and 20 deletions

View File

@@ -31,6 +31,7 @@ module Jekyll
payload = Utils.deep_merge_hashes({
"page" => document.to_liquid
}, site.site_payload)
info = {
filters: [Jekyll::Filters],
registers: { :site => site, :page => payload['page'] }
@@ -117,7 +118,7 @@ module Jekyll
File.join(site.config['layouts'], layout.name)
)
if layout = layouts[layout.data["layout"]]
if layout = site.layouts[layout.data["layout"]]
if used.include?(layout)
layout = nil # avoid recursive chain
else

View File

@@ -92,7 +92,7 @@ module Jekyll
end
end
def render
def to_render
config['render'] || Array.new
end
@@ -197,9 +197,7 @@ module Jekyll
#
# Returns nothing.
def read_collections
if collections
collections.each { |_, collection| collection.read }
end
collections.each { |_, collection| collection.read }
end
# Run each of the Generators.
@@ -217,11 +215,9 @@ module Jekyll
def render
relative_permalinks_deprecation_method
if collections
collections.each do |label, collection|
collection.docs.each do |document|
document.output = Jekyll::Renderer.new(self, document).run
end
collections.each do |label, collection|
collection.docs.each do |document|
document.output = Jekyll::Renderer.new(self, document).run
end
end
@@ -389,11 +385,9 @@ module Jekyll
def documents
docs = Set.new
if collections
collections.each do |label, coll|
if render.include?(label)
docs = docs.merge(coll.docs)
end
collections.each do |label, coll|
if to_render.include?(label)
docs = docs.merge(coll.docs)
end
end
docs