|
@@ -2,11 +2,9 @@ package ginpongo2
|
|
|
|
|
|
import (
|
|
|
"fmt"
|
|
|
- "net/http"
|
|
|
- "strings"
|
|
|
-
|
|
|
"github.com/flosch/pongo2"
|
|
|
"github.com/gin-gonic/gin/render"
|
|
|
+ "net/http"
|
|
|
)
|
|
|
|
|
|
var Suffix = ".html.twig"
|
|
@@ -45,17 +43,9 @@ func (r *PongoRenderer) WriteContentType(w http.ResponseWriter) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func New(basedir string, debug bool, loaders ...pongo2.TemplateLoader) *Pongo {
|
|
|
+func New(debug bool, loaders ...pongo2.TemplateLoader) *Pongo {
|
|
|
p := new(Pongo)
|
|
|
- p.set = pongo2.NewSet("html")
|
|
|
+ p.set = pongo2.NewSet("html", loaders...)
|
|
|
p.set.Debug = debug
|
|
|
- if !strings.HasSuffix(basedir, "/") {
|
|
|
- basedir = basedir + "/"
|
|
|
- }
|
|
|
- if len(loaders) > 0 {
|
|
|
- p.set.AddLoader(loaders...)
|
|
|
- } else {
|
|
|
- p.set.AddLoader(pongo2.MustNewLocalFileSystemLoader(basedir))
|
|
|
- }
|
|
|
return p
|
|
|
}
|