Fixes html debug mode

mycloudb · Aug 20, 2014 · 46225ea · 46225ea
1 parent 94f2f3f
commit 46225ea
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/gin.go b/gin.go
@@ -82,22 +82,26 @@ func Default() *Engine {
 }
 
 func (engine *Engine) LoadHTMLGlob(pattern string) {
-	templ := template.Must(template.ParseGlob(pattern))
-	engine.SetHTMLTemplate(templ)
+	if gin_mode == debugCode {
+		engine.HTMLRender = render.HTMLDebug
+	} else {
+		templ := template.Must(template.ParseGlob(pattern))
+		engine.SetHTMLTemplate(templ)
+	}
 }
 
 func (engine *Engine) LoadHTMLFiles(files ...string) {
-	templ := template.Must(template.ParseFiles(files...))
-	engine.SetHTMLTemplate(templ)
-}
-
-func (engine *Engine) SetHTMLTemplate(templ *template.Template) {
 	if gin_mode == debugCode {
 		engine.HTMLRender = render.HTMLDebug
 	} else {
-		engine.HTMLRender = render.HTMLRender{
-			Template: templ,
-		}
+		templ := template.Must(template.ParseFiles(files...))
+		engine.SetHTMLTemplate(templ)
+	}
+}
+
+func (engine *Engine) SetHTMLTemplate(templ *template.Template) {
+	engine.HTMLRender = render.HTMLRender{
+		Template: templ,
 	}
 }
 

diff --git a/render/render.go b/render/render.go
@@ -82,7 +82,11 @@ func (_ htmlDebugRender) Render(w http.ResponseWriter, code int, data ...interfa
 	writeHeader(w, code, "text/html")
 	file := data[0].(string)
 	obj := data[1]
-	return template.New(file).Execute(w, obj)
+	t, err := template.ParseFiles(file)
+	if err != nil {
+		return err
+	}
+	return t.ExecuteTemplate(w, file, obj)
 }
 
 func (html HTMLRender) Render(w http.ResponseWriter, code int, data ...interface{}) error {