Permalink
Browse files

output: Fix the shortcodes/partials vs base template detection

Fixes #4897
  • Loading branch information...
bep committed Jul 2, 2018
1 parent f465571 commit a5d0a57e6bdab583134a68c035aac9b3007f006a
Showing with 19 additions and 3 deletions.
  1. +7 −3 output/layout_base.go
  2. +12 −0 output/layout_base_test.go
@@ -58,6 +58,10 @@ type TemplateLookupDescriptor struct {
ContainsAny func(filename string, subslices [][]byte) (bool, error)
}
func isShorthCodeOrPartial(name string) bool {
return strings.HasPrefix(name, "shortcodes/") || strings.HasPrefix(name, "partials/")
}
func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) {
name := filepath.ToSlash(d.RelPath)
@@ -104,13 +108,13 @@ func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) {
}
// Ace and Go templates may have both a base and inner template.
pathDir := filepath.Dir(d.RelPath)
if ext == "amber" || strings.HasSuffix(pathDir, "partials") || strings.HasSuffix(pathDir, "shortcodes") {
if ext == "amber" || isShorthCodeOrPartial(name) {
// No base template support
return id, nil
}
pathDir := filepath.Dir(d.RelPath)
innerMarkers := goTemplateInnerMarkers
var baseFilename string
@@ -75,6 +75,18 @@ func TestLayoutBase(t *testing.T) {
Name: "partials/menu.html",
OverlayFilename: "partials/menu.html",
}},
{"Partial in subfolder", TemplateLookupDescriptor{WorkingDir: workingDir, RelPath: "/partials/sub/menu.html"}, true,
"_default/baseof.html",
TemplateNames{
Name: "partials/sub/menu.html",
OverlayFilename: "/partials/sub/menu.html",
}},
{"Shortcode in subfolder", TemplateLookupDescriptor{WorkingDir: workingDir, RelPath: "shortcodes/sub/menu.html"}, true,
"_default/baseof.html",
TemplateNames{
Name: "shortcodes/sub/menu.html",
OverlayFilename: "shortcodes/sub/menu.html",
}},
{"AMP, no base", TemplateLookupDescriptor{WorkingDir: workingDir, RelPath: layoutPathAmp}, false, "",
TemplateNames{
Name: "_default/single.amp.html",

0 comments on commit a5d0a57

Please sign in to comment.