Overwork content merge #36
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
added 5 commits
November 24, 2016 15:34
* Start merging with 'layout' fragmnent * introduced name filed for content
domano
approved these changes
Dec 7, 2016
| f, found := cntx.Body[name] | ||
|
|
||
| // Normalize main# as main | ||
| if !found && strings.HasSuffix(name, "#") { |
There was a problem hiding this comment.
Maybe "#" should be configurable or at least declared at the top because it is used more than once. ("magic string")
| } | ||
| func (cntx *ContentMerge) addBody(c Content) { | ||
|
|
||
| for loalName, f := range c.Body() { |
| if strings.HasPrefix(placeholder, "#") { | ||
| placeholder = placeholder[1:] | ||
| } | ||
| // TODO !!!!!!! How to handle the has in name resolving??? |
There was a problem hiding this comment.
Should a //TODO be merged into the master? Maybe you just forgot about it.
Resolved conflicts in test files.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fetch Definitions now have a name, so that a fragment now can have a name of the form
page#fragment. The templating now starts with the 'layout' page.
Also I had to do some refactorings to do that.
I still have to do some documentation task, but please start reviewing.