jichan.org/jichan.org-go
jichan.org/jichan.org-go
Archived
1
0
Fork 0
generated from ElnuDev/go-project
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add search highlighting

Browse source
This commit is contained in:
Elnu 2023-07-23 15:00:31 -07:00
parent b20cdaf819
commit 3965b59893
3 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
httputils/templates.go
View file

@ -29,9 +29,11 @@ func newTemplateSet(partials *TemplateSet, paths ...string) TemplateSet {
fileInfo, _ := os.Stat(path)
modTimes[path] = fileInfo.ModTime()
}
templates := template.Must(template.ParseFiles(allPaths...))
templates := template.Template{}
templates.Funcs(DefaultTemplateFuncs)
templates.ParseFiles(allPaths...)
return TemplateSet{
templates: templates,
templates: &templates,
paths: allPaths,
loadTimes: modTimes,
}
@ -46,7 +48,10 @@ func NewTemplateSet(paths ...string) TemplateSet {
func (templateSet *TemplateSet) ExecuteTemplate(wr io.Writer, name string, data any) error {
templateSet.reloadTemplatesIfModified()
return templateSet.templates.ExecuteTemplate(wr, name, data)
templateSet.templates.Funcs(TemplateFuncs)
err := templateSet.templates.ExecuteTemplate(wr, name, data)
TemplateFuncs = DefaultTemplateFuncs
return err
}
func (templateSet *TemplateSet) reloadTemplatesIfModified() {
@ -86,3 +91,5 @@ const partialsFolder = templateFolder + "/partials"
var paths, _ = getTemplatePathsInDirectory(partialsFolder)
var partials = newTemplateSet(nil, paths...)
var DefaultTemplateFuncs template.FuncMap
var TemplateFuncs template.FuncMap