Skip to content

Commit bb30256

Browse files
FennyFenny
authored
Merge pull request #52 from Fenny/master
🩹 fix partial clone err
2 parents fb60c74 + e10dd6e commit bb30256

File tree

11 files changed

+37
-12
lines changed

11 files changed

+37
-12
lines changed

‎ace/ace.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ func (e *Engine) Load() error {
201201
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
202202
// reload the views
203203
if !e.loaded || e.reload {
204+
if e.reload {
205+
e.loaded = false
206+
}
204207
ace.FlushCache()
205208
if err := e.Load(); err != nil {
206209
return err

‎amber/amber.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,9 @@ func (e *Engine) Load() error {
189189
// Render will execute the template name along with the given values.
190190
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
191191
if !e.loaded || e.reload {
192+
if e.reload {
193+
e.loaded = false
194+
}
192195
if err := e.Load(); err != nil {
193196
return err
194197
}

‎django/django.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,9 @@ func getPongoBinding(binding interface{}) pongo2.Context {
199199
// Render will render the template by name
200200
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
201201
if !e.loaded || e.reload {
202+
if e.reload {
203+
e.loaded = false
204+
}
202205
if err := e.Load(); err != nil {
203206
return err
204207
}

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/cbroglie/mustache v1.2.0
1111
github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385
1212
github.com/flosch/pongo2 v0.0.0-20200913210552-0d938eb266f3
13-
github.com/gofiber/fiber/v2 v2.0.3
13+
github.com/gofiber/fiber/v2 v2.0.4
1414
github.com/mattn/go-slim v0.0.0-20200618151855-bde33eecb5ee
1515
github.com/valyala/bytebufferpool v1.0.0
1616
github.com/yosssi/ace v0.0.5

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4
113113
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
114114
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
115115
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
116-
github.com/gofiber/fiber/v2 v2.0.3 h1:9n2zCUMjjHtIPe8PAhuonK+Uu4sP6R9kBp/PXJd3LQM=
117-
github.com/gofiber/fiber/v2 v2.0.3/go.mod h1:mivxXgv/0yEQR710u11VpKUbKL1Vc4ZSfX4mGRo7zGs=
116+
github.com/gofiber/fiber/v2 v2.0.4 h1:57Q8Uq6Y/N/Glx9666ScyBbjcIW1xDyl8ic/W8sT9qY=
117+
github.com/gofiber/fiber/v2 v2.0.4/go.mod h1:VyfrlfcUCW0TcO5uaLHVlxZ8N25BgwnP6YjkzJmJP24=
118118
github.com/gofrs/flock v0.7.1 h1:DP+LD/t0njgoPBvT5MJLeliUIVQR03hiKR6vezdwHlc=
119119
github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
120120
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -492,8 +492,8 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
492492
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
493493
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
494494
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
495-
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009 h1:W0lCpv29Hv0UaM1LXb9QlBHLNP8UFfcKjblhVCWftOM=
496-
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
495+
golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c h1:/h0vtH0PyU0xAoZJVcRw1k0Ng+U0JAy3QDiFmppIlIE=
496+
golang.org/x/sys v0.0.0-20200929083018-4d22bbb62b3c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
497497
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
498498
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
499499
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=

‎handlebars/handlebars.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@ func (e *Engine) Load() (err error) {
180180
// Execute will render the template by name
181181
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
182182
if !e.loaded || e.reload {
183+
if e.reload {
184+
e.loaded = false
185+
}
183186
if err := e.Load(); err != nil {
184187
return err
185188
}

‎html/html.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,12 @@ func (e *Engine) Parse() error {
118118

119119
// Load parses the templates to the engine.
120120
func (e *Engine) Load() error {
121+
if e.loaded {
122+
return nil
123+
}
121124
// race safe
122125
e.mutex.Lock()
123126
defer e.mutex.Unlock()
124-
125127
e.Templates = template.New(e.directory)
126128

127129
// Set template settings
@@ -184,6 +186,9 @@ func (e *Engine) Load() error {
184186
// Render will execute the template name along with the given values.
185187
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
186188
if !e.loaded || e.reload {
189+
if e.reload {
190+
e.loaded = false
191+
}
187192
if err := e.Load(); err != nil {
188193
return err
189194
}
@@ -198,16 +203,12 @@ func (e *Engine) Render(out io.Writer, template string, binding interface{}, lay
198203
if lay == nil {
199204
return fmt.Errorf("render: layout %s does not exist", layout[0])
200205
}
201-
layCopy, err := lay.Clone()
202-
if err != nil {
203-
return err
204-
}
205-
layCopy.Funcs(map[string]interface{}{
206+
lay.Funcs(map[string]interface{}{
206207
e.layout: func() error {
207208
return tmpl.Execute(out, binding)
208209
},
209210
})
210-
return layCopy.Execute(out, binding)
211+
return lay.Execute(out, binding)
211212
}
212213
return tmpl.Execute(out, binding)
213214
}

‎jet/jet.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ func (e *Engine) Load() error {
190190
// Execute will render the template by name
191191
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
192192
if !e.loaded || e.reload {
193+
if e.reload {
194+
e.loaded = false
195+
}
193196
if err := e.Load(); err != nil {
194197
return err
195198
}

‎mustache/mustache.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,9 @@ func (e *Engine) Load() error {
157157
// Execute will render the template by name
158158
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
159159
if !e.loaded || e.reload {
160+
if e.reload {
161+
e.loaded = false
162+
}
160163
if err := e.Load(); err != nil {
161164
return err
162165
}

‎pug/pug.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,9 @@ func (e *Engine) Load() error {
190190
// Execute will render the template by name
191191
func (e *Engine) Render(out io.Writer, template string, binding interface{}, layout ...string) error {
192192
if !e.loaded || e.reload {
193+
if e.reload {
194+
e.loaded = false
195+
}
193196
if err := e.Load(); err != nil {
194197
return err
195198
}

0 commit comments

Comments
 (0)