From ca9d6a543335e998963ac4f680cf5c47e597602b Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 16 Oct 2024 22:18:06 +0200 Subject: Inline form package --- templ/template.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'templ/template.go') diff --git a/templ/template.go b/templ/template.go index f609bc4..9cefadc 100644 --- a/templ/template.go +++ b/templ/template.go @@ -7,7 +7,7 @@ import ( "os" "sync" - "github.com/Necoro/form" + "gosten/form" ) //go:embed *.tpl @@ -17,7 +17,6 @@ var templates = make(map[string]*template.Template) var muTpl sync.RWMutex var baseTpl *template.Template -var formBuilder form.Builder var isLive = sync.OnceValue(checkLive) @@ -31,10 +30,9 @@ func checkLive() bool { func loadBase(fs fs.FS) { baseTpl = template.Must(template.New("base.tpl"). - Funcs(form.FuncMap()). + Funcs(form.ParsingFuncMap()). ParseFS(fs, "base.tpl", "form.tpl", "navlinks.tpl", "content.tpl")) - formBuilder = form.Builder{InputTemplate: baseTpl.Lookup("formItem")} - baseTpl.Funcs(formBuilder.FuncMap()) + baseTpl.Funcs(form.FuncMap(baseTpl.Lookup("formItem"))) } func Lookup(name string) *template.Template { -- cgit v1.2.3-70-g09d2