1 files changed, 20 insertions, 14 deletions

diff --git a/echo/template_renderer.go b/echo/template_renderer.go
index 7bfd006..8515249 100644
--- a/echo/template_renderer.go
+++ b/echo/template_renderer.go
@@ -11,7 +11,7 @@ import (
 )
 
 type TemplateChecker interface {
-        HaveTemplate(echo.Context, string) bool
+        HaveTemplate(string) bool
 }
 
 type TemplateRenderer struct {
@@ -19,12 +19,19 @@ type TemplateRenderer struct {
         glob      string
         funcs     template.FuncMap
         cache     *template.Template
+        debug     bool
 }
 
-func NewTemplateRenderer(templates fs.FS, glob string, funcs template.FuncMap) (*TemplateRenderer, error) {
+func NewTemplateRenderer(templates fs.FS, glob string, funcs template.FuncMap, debug bool) (*TemplateRenderer, error) {
         var err error
 
-        r := &TemplateRenderer{templates: templates, glob: glob, funcs: funcs}
+        r := &TemplateRenderer{
+                templates: templates,
+                glob:      glob,
+                funcs:     funcs,
+                debug:     debug,
+        }
+
         r.cache, err = r.loadTemplates()
         if err != nil {
                 return nil, err
@@ -65,22 +72,21 @@ func (r *TemplateRenderer) loadTemplates() (*template.Template, error) {
         return t, nil
 }
 
-func (r *TemplateRenderer) getTemplateCache(ctx echo.Context) (*template.Template, error) {
-        var err error
+func (r *TemplateRenderer) getTemplateCache() (*template.Template, error) {
+        if !r.debug {
+                return r.cache, nil
+        }
 
-        tc := r.cache
-        if ctx.Echo().Debug {
-                tc, err = r.loadTemplates()
-                if err != nil {
-                        return nil, err
-                }
+        tc, err := r.loadTemplates()
+        if err != nil {
+                return nil, err
         }
 
         return tc, nil
 }
 
 func (r *TemplateRenderer) Render(w io.Writer, name string, data interface{}, ctx echo.Context) error {
-        tc, err := r.getTemplateCache(ctx)
+        tc, err := r.getTemplateCache()
         if err != nil {
                 return err
         }
@@ -96,8 +102,8 @@ func (r *TemplateRenderer) Render(w io.Writer, name string, data interface{}, ct
         return nil
 }
 
-func (r *TemplateRenderer) HaveTemplate(ctx echo.Context, name string) bool {
-        tc, err := r.getTemplateCache(ctx)
+func (r *TemplateRenderer) HaveTemplate(name string) bool {
+        tc, err := r.getTemplateCache()
         if err != nil {
                 return false
         }