Merge pull request #2830 from kansaichris/render-liquid-in-coffeescript

This commit is contained in:
Parker Moore 2014-08-28 19:35:44 -07:00
commit 190ab7f6b8
4 changed files with 17 additions and 9 deletions

View File

@ -27,8 +27,8 @@ Feature: Rendering
Then the _site directory should not exist
And I should see "Invalid CSS after" in the build output
Scenario: Don't render liquid in CoffeeScript
Given I have an "index.coffee" page that contains "hey='for {{site.animal}}'"
Scenario: Render liquid in CoffeeScript
Given I have an "index.coffee" page with animal "cicada" that contains "hey='for {{page.animal}}'"
When I run jekyll build
Then the _site directory should exist
And I should see "hey = 'for {{site.animal}}';" in "_site/index.js"
And I should see "hey = 'for cicada';" in "_site/index.js"

View File

@ -162,16 +162,14 @@ module Jekyll
# Determine whether the file should be rendered with Liquid.
#
# Returns false if the document is either an asset file or a yaml file,
# true otherwise.
# Always returns true.
def render_with_liquid?
!coffeescript_file?
true
end
# Determine whether the file should be placed into layouts.
#
# Returns false if the document is either an asset file or a yaml file,
# true otherwise.
# Returns false if the document is an asset file.
def place_in_layout?
!asset_file?
end

View File

@ -25,6 +25,15 @@ have a file named `css/styles.scss` in your site's source folder, Jekyll
will process it and put it in your site's destination folder under
`css/styles.css`.
<div class="note info">
<h5>Jekyll processes all Liquid filters and tags in asset files</h5>
<p>If you are using <a href="http://mustache.github.io">Mustache</a>
or another JavaScript templating language that conflicts with
the <a href="/docs/templates/">Liquid template syntax</a>, you
will need to place <code>{&#37; raw &#37;}</code> and
<code>{&#37; endraw &#37;}</code> tags around your code.</p>
</div>
## Sass/SCSS
Jekyll allows you to customize your Sass conversion in certain ways.

View File

@ -1,4 +1,5 @@
---
message: "I knew it!"
---
$ ->
@ -7,4 +8,4 @@ $ ->
cube = (x) -> square(x) * x
cubes = (math.cube num for num in list)
alert "I knew it!" if elvis?
alert "{{ page.message }}" if elvis?