Rename tag to `include_relative`

This commit is contained in:
Garen Torikian 2014-09-06 21:48:15 -07:00
parent 787bb582da
commit 9f558d1cec
4 changed files with 12 additions and 12 deletions

View File

@ -23,7 +23,7 @@ module Jekyll
case tag_name case tag_name
when 'include' when 'include'
@includes_dir = '_includes' @includes_dir = '_includes'
when 'relative_include' when 'include_relative'
@includes_dir = '' @includes_dir = ''
end end
@ -106,7 +106,7 @@ eos
case @tag_name case @tag_name
when 'include' when 'include'
dir = File.join(File.realpath(context.registers[:site].source), @includes_dir) dir = File.join(File.realpath(context.registers[:site].source), @includes_dir)
when 'relative_include' when 'include_relative'
dir = File.join(File.realpath(context.registers[:site].source), File.dirname(context.registers[:page]["path"])) dir = File.join(File.realpath(context.registers[:site].source), File.dirname(context.registers[:page]["path"]))
end end
file = render_variable(context) || @file file = render_variable(context) || @file
@ -152,4 +152,4 @@ eos
end end
Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag) Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag)
Liquid::Template.register_tag('relative_include', Jekyll::Tags::RelativeIncludeTag) Liquid::Template.register_tag('include_relative', Jekyll::Tags::IncludeTag)

View File

@ -2,24 +2,24 @@
title: Post title: Post
layout: post layout: post
include1: rel_include.html include1: rel_include.html
include2: relative_includes/rel_include include2: include_relative/rel_include
include3: rel_INCLUDE include3: rel_INCLUDE
include4: params include4: params
include5: clude include5: clude
--- ---
Liquid tests Liquid tests
- 1 {% relative_include relative_includes/{{ page.include1 }} %} - 1 {% include_relative include_relative/{{ page.include1 }} %}
- 2 {% relative_include {{ page.include2 | append: '.html' }} %} - 2 {% include_relative {{ page.include2 | append: '.html' }} %}
- 3 {% relative_include relative_includes/{{ page.include3 | downcase | append: '.html' }} %} - 3 {% include_relative include_relative/{{ page.include3 | downcase | append: '.html' }} %}
Whitespace tests Whitespace tests
- 4 {% relative_include relative_includes/{{page.include1}} %} - 4 {% include_relative include_relative/{{page.include1}} %}
- 5 {% relative_include relative_includes/{{ page.include1}} %} - 5 {% include_relative include_relative/{{ page.include1}} %}
- 6 {% relative_include relative_includes/{{ page.include3 | downcase | append: '.html'}} %} - 6 {% include_relative include_relative/{{ page.include3 | downcase | append: '.html'}} %}
Parameters test Parameters test
- 7 {% relative_include relative_includes/{{ page.include4 | append: '.html' }} var1='foo' var2='bar' %} - 7 {% include_relative include_relative/{{ page.include4 | append: '.html' }} var1='foo' var2='bar' %}
Partial variable test Partial variable test
- 8 {% relative_include relative_includes/rel_in{{ page.include5 }}.html %} - 8 {% include_relative include_relative/rel_in{{ page.include5 }}.html %}