github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-29 18:12:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

tpl: Make absURL and relURL accept anything

Browse source
This commit is contained in:
Stephan Kulla 2016-08-13 00:31:50 +02:00 committed by Bjørn Erik Pedersen
parent 26725515c8
commit 88dcbc6efa
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tpl/template_funcs.go
View file

@ -1803,7 +1803,7 @@ func htmlUnescape(in interface{}) (string, error) {
func init() { func init() {
funcMap = template.FuncMap{ funcMap = template.FuncMap{
"absURL": func(a string) template.HTML { return template.HTML(helpers.AbsURL(a)) }, "absURL": func(a interface{}) template.HTML { return template.HTML(helpers.AbsURL(cast.ToString(a))) },
"add": func(a, b interface{}) (interface{}, error) { return helpers.DoArithmetic(a, b, '+') }, "add": func(a, b interface{}) (interface{}, error) { return helpers.DoArithmetic(a, b, '+') },
"after": after, "after": after,
"apply": apply, "apply": apply,
@ -1856,7 +1856,7 @@ func init() {
"readDir": readDirFromWorkingDir, "readDir": readDirFromWorkingDir,
"readFile": readFileFromWorkingDir, "readFile": readFileFromWorkingDir,
"ref": ref, "ref": ref,
"relURL": func(a string) template.HTML { return template.HTML(helpers.RelURL(a)) }, "relURL": func(a interface{}) template.HTML { return template.HTML(helpers.RelURL(cast.ToString(a))) },
"relref": relRef, "relref": relRef,
"replace": replace, "replace": replace,
"replaceRE": replaceRE, "replaceRE": replaceRE,

4
tpl/template_funcs_test.go
View file

@ -82,6 +82,7 @@ func TestFuncsInTemplate(t *testing.T) {
in := in :=
`absURL: {{ "http://gohugo.io/" | absURL }} `absURL: {{ "http://gohugo.io/" | absURL }}
absURL: {{ "mystyle.css" | absURL }} absURL: {{ "mystyle.css" | absURL }}
absURL: {{ 42 | absURL }}
add: {{add 1 2}} add: {{add 1 2}}
base64Decode 1: {{ "SGVsbG8gd29ybGQ=" | base64Decode }} base64Decode 1: {{ "SGVsbG8gd29ybGQ=" | base64Decode }}
base64Decode 2: {{ 42 | base64Encode | base64Decode }} base64Decode 2: {{ 42 | base64Encode | base64Decode }}
@ -121,6 +122,7 @@ readDir: {{ range (readDir ".") }}{{ .Name }}{{ end }}
readFile: {{ readFile "README.txt" }} readFile: {{ readFile "README.txt" }}
relURL 1: {{ "http://gohugo.io/" | relURL }} relURL 1: {{ "http://gohugo.io/" | relURL }}
relURL 2: {{ "mystyle.css" | relURL }} relURL 2: {{ "mystyle.css" | relURL }}
relURL 2: {{ mul 2 21 | relURL }}
replace: {{ replace "Batman and Robin" "Robin" "Catwoman" }} replace: {{ replace "Batman and Robin" "Robin" "Catwoman" }}
replaceRE: {{ "http://gohugo.io/docs" | replaceRE "^https?://([^/]+).*" "$1" }} replaceRE: {{ "http://gohugo.io/docs" | replaceRE "^https?://([^/]+).*" "$1" }}
safeCSS: {{ "Bat&Man" | safeCSS | safeCSS }} safeCSS: {{ "Bat&Man" | safeCSS | safeCSS }}
@ -146,6 +148,7 @@ urlize: {{ "Bat Man" | urlize }}
expected := `absURL: http://gohugo.io/ expected := `absURL: http://gohugo.io/
absURL: http://mysite.com/hugo/mystyle.css absURL: http://mysite.com/hugo/mystyle.css
absURL: http://mysite.com/hugo/42
add: 3 add: 3
base64Decode 1: Hello world base64Decode 1: Hello world
base64Decode 2: 42 base64Decode 2: 42
@ -185,6 +188,7 @@ readDir: README.txt
readFile: Hugo Rocks! readFile: Hugo Rocks!
relURL 1: http://gohugo.io/ relURL 1: http://gohugo.io/
relURL 2: /hugo/mystyle.css relURL 2: /hugo/mystyle.css
relURL 2: /hugo/42
replace: Batman and Catwoman replace: Batman and Catwoman
replaceRE: gohugo.io replaceRE: gohugo.io
safeCSS: Bat&Man safeCSS: Bat&Man