vinchent/gin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into performance

Browse Source 
Conflicts:
	binding/form_mapping.go
	context_test.go
This commit is contained in:
Manu Mtz-Almeida
2015-04-07 19:59:43 +02:00
parent d33079d0ec 3fce8efcc6
commit a4eadceb45
14 changed files with 68 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gin.go
View File

@ -115,8 +115,7 @@ func (engine *Engine) allocateContext() (context *Context) {
func (engine *Engine) LoadHTMLGlob(pattern string) {
if IsDebugging() {
r := &render.HTMLDebugRender{Glob: pattern}
engine.HTMLRender = r
engine.HTMLRender = &render.HTMLDebugRender{Glob: pattern}
} else {
templ := template.Must(template.ParseGlob(pattern))
engine.SetHTMLTemplate(templ)
@ -125,8 +124,7 @@ func (engine *Engine) LoadHTMLGlob(pattern string) {
func (engine *Engine) LoadHTMLFiles(files ...string) {
if IsDebugging() {
r := &render.HTMLDebugRender{Files: files}
engine.HTMLRender = r
engine.HTMLRender = &render.HTMLDebugRender{Files: files}
} else {
templ := template.Must(template.ParseFiles(files...))
engine.SetHTMLTemplate(templ)