go-packages/iris
1
0
Fork 0
mirror of https://github.com/kataras/iris.git synced 2025-02-02 15:30:36 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

https://github.com/kataras/iris/issues/167

Browse Source
This commit is contained in:
Makis Maropoulos 2016-06-02 18:27:35 +03:00
parent 7f82b101c7
commit 56a9fba34d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/render.go
View File

@ -125,12 +125,12 @@ type (
// Right delimeter, default is }} // Right delimeter, default is }}
Right string Right string
// Funcs like html/template // Funcs like html/template
Funcs template.FuncMap Funcs map[string]interface{}
// Funcs like html/template // Funcs like html/template
// the difference from Funcs is that these funcs // the difference from Funcs is that these funcs
// can be used inside a layout and can override the predefined (yield,partial...) or add more custom funcs // can be used inside a layout and can override the predefined (yield,partial...) or add more custom funcs
// these can override the Funcs inside no-layout templates also, use it when you know what you're doing // these can override the Funcs inside no-layout templates also, use it when you know what you're doing
LayoutFuncs template.FuncMap LayoutFuncs map[string]interface{}
} }
// Pongo the configs for PongoEngine // Pongo the configs for PongoEngine
Pongo struct { Pongo struct {
@ -207,7 +207,7 @@ func DefaultTemplate() Template {
ContentType: "text/html", ContentType: "text/html",
Charset: "UTF-8", Charset: "UTF-8",
Layout: "", // currently this is the only config which not working for pongo2 yet but I will find a way Layout: "", // currently this is the only config which not working for pongo2 yet but I will find a way
HTMLTemplate: HTMLTemplate{Left: "{{", Right: "}}", Funcs: template.FuncMap{}, LayoutFuncs: template.FuncMap{}}, HTMLTemplate: HTMLTemplate{Left: "{{", Right: "}}", Funcs: make(map[string]interface{}, 0), LayoutFuncs: make(map[string]interface{}, 0)},
Pongo: Pongo{Filters: make(map[string]pongo2.FilterFunction, 0), Globals: make(map[string]interface{}, 0)}, Pongo: Pongo{Filters: make(map[string]pongo2.FilterFunction, 0), Globals: make(map[string]interface{}, 0)},
Markdown: Markdown{Sanitize: false}, Markdown: Markdown{Sanitize: false},
Amber: Amber{Funcs: template.FuncMap{}}, Amber: Amber{Funcs: template.FuncMap{}},

10
iris.go
View File

@ -134,6 +134,16 @@ func (s *Iris) initTemplates() {
return "", nil return "", nil
}, },
} }
// these should be already a non-nil map but if .New(cfg) it's not, is mergo's bug, temporary:
if s.config.Render.Template.HTMLTemplate.LayoutFuncs == nil {
s.config.Render.Template.HTMLTemplate.LayoutFuncs = make(map[string]interface{}, 1)
}
if s.config.Render.Template.HTMLTemplate.Funcs == nil {
s.config.Render.Template.HTMLTemplate.Funcs = make(map[string]interface{}, 1)
}
//
for k, v := range funcs { for k, v := range funcs {
// we don't want to override the user's LayoutFuncs, user should be able to override anything. // we don't want to override the user's LayoutFuncs, user should be able to override anything.
if s.config.Render.Template.HTMLTemplate.LayoutFuncs[k] == nil { if s.config.Render.Template.HTMLTemplate.LayoutFuncs[k] == nil {