Disable automatically-generated excerpts with option #1386
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@benbalter Thoughts? |
|
This one looks good to me. Disabling excerpts is a fair expectation when the separator is explicitly empty. |
| end | ||
|
|
||
| def should_generate_excerpt? | ||
| !(site.config['excerpt_separator'].to_s == "") |
There was a problem hiding this comment.
!(site.config['excerpt_separator'].to_s.empty?) instead?
|
Need to add tests for this and then we're good. :D |
| @@ -255,7 +255,9 @@ def render(layouts, site_payload) | |||
| "page" => self.to_liquid(EXCERPT_ATTRIBUTES_FOR_LIQUID) | |||
| }.deep_merge(site_payload) | |||
|
|
|||
| self.extracted_excerpt.do_layout(payload, {}) | |||
| if should_generate_excerpt? | |||
There was a problem hiding this comment.
generate_excerpt? instead?
Shorter, and seems more idiomatic to leave off the qualifiers such as is_ and should_
|
👍 |
|
💥 test added. |
|
Test looks good! Thanks for doing that. |
parkr
added a commit
that referenced
this pull request
Aug 8, 2013
Disable automatically-generated excerpts with option
parkr
added a commit
that referenced
this pull request
Aug 8, 2013
SLaks
added a commit
to SLaks/SLaks.Blog
that referenced
this pull request
Aug 9, 2013
Workaround for jekyll/jekyll#1380, jekyll/jekyll#1401. Should be reverted after jekyll/jekyll#1386 is released.
parkr
referenced
this pull request
Aug 23, 2013
After several page build fails, this seems to have fixed up the following error: lib/jekyll/excerpt.rb:108:in `partition': type mismatch: NilClass given (TypeError)
Merged
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If
excerpt_separatoris set to"", automatically-extracted excerpts are notgenerated and replaced with just an empty string.
Ref: #1380, #933, #837, #1339, #1302, #1033, #1321, #1307