diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-04-02 14:20:34 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-04-02 14:20:34 +0200 |
commit | 7eb71ee06419f9ceedfd701ab2a27513ef448829 (patch) | |
tree | 254ba6c75575e067df76b4abe4e566936619adcb /output/layout_base.go | |
parent | c97dae40d9cd24c467f5b8cfbe2ac06f3cdef1d2 (diff) |
Revert "tpl: Rework to handle both text and HTML templates"
Will have to take another stab at this ...
This reverts commit 5c5efa03d2512749950b0d05a7d4bde35ecbdc37.
Closes #3260
Diffstat (limited to 'output/layout_base.go')
-rw-r--r-- | output/layout_base.go | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/output/layout_base.go b/output/layout_base.go index a0d2bc4eb..2bb89c20d 100644 --- a/output/layout_base.go +++ b/output/layout_base.go @@ -29,10 +29,7 @@ var ( ) type TemplateNames struct { - // The name used as key in the template map. Note that this will be - // prefixed with "_text/" if it should be parsed with text/template. - Name string - + Name string OverlayFilename string MasterFilename string } @@ -54,10 +51,6 @@ type TemplateLookupDescriptor struct { // The theme name if active. Theme string - // All the output formats in play. This is used to decide if text/template or - // html/template. - OutputFormats Formats - FileExists func(filename string) (bool, error) ContainsAny func(filename string, subslices [][]byte) (bool, error) } @@ -81,12 +74,6 @@ func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) { // index.amp.html // index.json filename := filepath.Base(d.RelPath) - isPlainText := false - outputFormat, found := d.OutputFormats.FromFilename(filename) - - if found && outputFormat.IsPlainText { - isPlainText = true - } var ext, outFormat string @@ -103,10 +90,6 @@ func CreateTemplateNames(d TemplateLookupDescriptor) (TemplateNames, error) { id.OverlayFilename = fullPath id.Name = name - if isPlainText { - id.Name = "_text/" + id.Name - } - // Ace and Go templates may have both a base and inner template. pathDir := filepath.Dir(fullPath) |