Infrastructure/caddy
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-23 22:27:38 -05:00
Code Issues Activity

Merge pull request #1591 from tw4452852/template_funcs

Browse source 
template: support custom functions
This commit is contained in:
Matt Holt 2017-04-18 08:14:00 -06:00 committed by GitHub
commit f28a159b72
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
caddyhttp/httpserver/context.go
View file

@ -244,6 +244,9 @@ func (c Context) Markdown(filename string) (string, error) {
return string(markdown), nil
}
// TemplateFuncs contains user defined functions
var TemplateFuncs = template.FuncMap{}
// ContextInclude opens filename using fs and executes a template with the context ctx.
// This does the same thing that Context.Include() does, but with the ability to provide
// your own context so that the included files can have access to additional fields your
@ -261,7 +264,8 @@ func ContextInclude(filename string, ctx interface{}, fs http.FileSystem) (strin
return "", err
}
tpl, err := template.New(filename).Parse(string(body))
tpl := template.New(filename).Funcs(TemplateFuncs)
tpl, err = tpl.Parse(string(body))
if err != nil {
return "", err
}

3
caddyhttp/templates/templates.go
View file

@ -44,6 +44,9 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
tpl.Delims(rule.Delims[0], rule.Delims[1])
}
// Add custom functions
tpl.Funcs(httpserver.TemplateFuncs)
// Build the template
templatePath := filepath.Join(t.Root, fpath)
tpl, err := tpl.ParseFiles(templatePath)