Skip to content

Allow to use predefine compiled template from external #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0x5487 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow to use predefine compiled template from external #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d26baaf
add predefine template
0x5487 Apr 24, 2014
8972799
update comment
0x5487 Apr 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ type Options struct {
IndentJSON bool
// Allows changing of output to XHTML instead of HTML. Default is "text/html"
HTMLContentType string
// Allow to use predefine compiled template from external
Template *template.Template
}

// HTMLOptions is a struct for overriding some rendering Options for specific HTML call
Expand All @@ -118,16 +120,24 @@ type HTMLOptions struct {
func Renderer(options ...Options) martini.Handler {
opt := prepareOptions(options)
cs := prepareCharset(opt.Charset)
t := compile(opt)
var t *template.Template
if opt.Template == nil {
t = compile(opt)
}
return func(res http.ResponseWriter, req *http.Request, c martini.Context) {
var tc *template.Template
if martini.Env == martini.Dev {
// recompile for easy development
tc = compile(opt)
if opt.Template == nil {
if martini.Env == martini.Dev {
// recompile for easy development
tc = compile(opt)
} else {
// use a clone of the initial template
tc, _ = t.Clone()
}
} else {
// use a clone of the initial template
tc, _ = t.Clone()
tc = opt.Template
}

c.MapTo(&renderer{res, req, tc, opt, cs}, (*Render)(nil))
}
}
Expand Down