diff options
| author | Bjørn Erik Pedersen <[email protected]> | 2017-03-27 20:43:49 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <[email protected]> | 2017-04-02 11:37:30 +0200 |
| commit | 5c5efa03d2512749950b0d05a7d4bde35ecbdc37 (patch) | |
| tree | 9f3e31a7e30c51fab5ed3f7c323393fcafadc5e8 /deps | |
| parent | 73c1c7b69d8302000fa5c5b804ad3eeac36da12f (diff) | |
| download | hugo-5c5efa03d2512749950b0d05a7d4bde35ecbdc37.tar.gz hugo-5c5efa03d2512749950b0d05a7d4bde35ecbdc37.zip | |
tpl: Rework to handle both text and HTML templates
Before this commit, Hugo used `html/template` for all Go templates.
While this is a fine choice for HTML and maybe also RSS feeds, it is painful for plain text formats such as CSV, JSON etc.
This commit fixes that by using the `IsPlainText` attribute on the output format to decide what to use.
A couple of notes:
* The above requires a nonambiguous template name to type mapping. I.e. `/layouts/_default/list.json` will only work if there is only one JSON output format, `/layouts/_default/list.mytype.json` will always work.
* Ambiguous types will fall back to HTML.
* Partials inherits the text vs HTML identificator of the container template. This also means that plain text templates can only include plain text partials.
* Shortcode templates are, by definition, currently HTML templates only.
Fixes #3221
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/deps.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/deps.go b/deps/deps.go index 659f259dd..188863876 100644 --- a/deps/deps.go +++ b/deps/deps.go @@ -20,7 +20,7 @@ type Deps struct { Log *jww.Notepad `json:"-"` // The templates to use. - Tmpl tpl.Template `json:"-"` + Tmpl tpl.TemplateHandler `json:"-"` // The file systems to use. Fs *hugofs.Fs `json:"-"` @@ -40,7 +40,7 @@ type Deps struct { Language *helpers.Language templateProvider ResourceProvider - WithTemplate func(templ tpl.Template) error `json:"-"` + WithTemplate func(templ tpl.TemplateHandler) error `json:"-"` translationProvider ResourceProvider } @@ -158,7 +158,7 @@ type DepsCfg struct { // Template handling. TemplateProvider ResourceProvider - WithTemplate func(templ tpl.Template) error + WithTemplate func(templ tpl.TemplateHandler) error // i18n handling. TranslationProvider ResourceProvider |