Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
caddy
Commits
f77a7a80
Commit
f77a7a80
authored
Apr 18, 2017
by
Tw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
template: support custom functions
Signed-off-by:
Tw
<
tw19881113@gmail.com
>
parent
236341f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
caddyhttp/httpserver/context.go
caddyhttp/httpserver/context.go
+5
-1
caddyhttp/templates/templates.go
caddyhttp/templates/templates.go
+3
-0
No files found.
caddyhttp/httpserver/context.go
View file @
f77a7a80
...
@@ -244,6 +244,9 @@ func (c Context) Markdown(filename string) (string, error) {
...
@@ -244,6 +244,9 @@ func (c Context) Markdown(filename string) (string, error) {
return
string
(
markdown
),
nil
return
string
(
markdown
),
nil
}
}
// TemplateFuncs contains user defined functions
var
TemplateFuncs
=
template
.
FuncMap
{}
// ContextInclude opens filename using fs and executes a template with the context ctx.
// ContextInclude opens filename using fs and executes a template with the context ctx.
// This does the same thing that Context.Include() does, but with the ability to provide
// This does the same thing that Context.Include() does, but with the ability to provide
// your own context so that the included files can have access to additional fields your
// your own context so that the included files can have access to additional fields your
...
@@ -261,7 +264,8 @@ func ContextInclude(filename string, ctx interface{}, fs http.FileSystem) (strin
...
@@ -261,7 +264,8 @@ func ContextInclude(filename string, ctx interface{}, fs http.FileSystem) (strin
return
""
,
err
return
""
,
err
}
}
tpl
,
err
:=
template
.
New
(
filename
)
.
Parse
(
string
(
body
))
tpl
:=
template
.
New
(
filename
)
.
Funcs
(
TemplateFuncs
)
tpl
,
err
=
tpl
.
Parse
(
string
(
body
))
if
err
!=
nil
{
if
err
!=
nil
{
return
""
,
err
return
""
,
err
}
}
...
...
caddyhttp/templates/templates.go
View file @
f77a7a80
...
@@ -44,6 +44,9 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
...
@@ -44,6 +44,9 @@ func (t Templates) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error
tpl
.
Delims
(
rule
.
Delims
[
0
],
rule
.
Delims
[
1
])
tpl
.
Delims
(
rule
.
Delims
[
0
],
rule
.
Delims
[
1
])
}
}
// Add custom functions
tpl
.
Funcs
(
httpserver
.
TemplateFuncs
)
// Build the template
// Build the template
templatePath
:=
filepath
.
Join
(
t
.
Root
,
fpath
)
templatePath
:=
filepath
.
Join
(
t
.
Root
,
fpath
)
tpl
,
err
:=
tpl
.
ParseFiles
(
templatePath
)
tpl
,
err
:=
tpl
.
ParseFiles
(
templatePath
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment