github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl: Set Metrics at creation time

Browse source
This commit is contained in:
Bjørn Erik Pedersen 2017-09-26 20:42:40 +02:00
parent d3681f51c0
commit b5e1dc5892
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tpl/tplimpl/template.go
View file

@ -113,24 +113,16 @@ func (t *templateHandler) Lookup(name string) *tpl.TemplateAdapter {
// The templates are stored without the prefix identificator.
name = strings.TrimPrefix(name, textTmplNamePrefix)
te := t.text.Lookup(name)
if te != nil {
te.Metrics = t.Deps.Metrics
}
return te
return t.text.Lookup(name)
}
// Look in both
if te := t.html.Lookup(name); te != nil {
te.Metrics = t.Deps.Metrics
return te
}
te := t.text.Lookup(name)
if te != nil {
te.Metrics = t.Deps.Metrics
}
return te
return t.text.Lookup(name)
}
func (t *templateHandler) clone(d *deps.Deps) *templateHandler {
@ -210,7 +202,7 @@ func (t *htmlTemplates) Lookup(name string) *tpl.TemplateAdapter {
if templ == nil {
return nil
}
return &tpl.TemplateAdapter{Template: templ}
return &tpl.TemplateAdapter{Template: templ, Metrics: t.funcster.Deps.Metrics}
}
func (t *htmlTemplates) lookup(name string) *template.Template {
@ -250,7 +242,7 @@ func (t *textTemplates) Lookup(name string) *tpl.TemplateAdapter {
if templ == nil {
return nil
}
return &tpl.TemplateAdapter{Template: templ}
return &tpl.TemplateAdapter{Template: templ, Metrics: t.funcster.Deps.Metrics}
}
func (t *textTemplates) lookup(name string) *texttemplate.Template {