github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add reference to parent shortcode

Browse source 
Fixes #1936
This commit is contained in:
Bjørn Erik Pedersen 2016-03-08 20:56:24 +01:00
parent 866176be97
commit 9896cd0030
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/content/extras/shortcodes.md
View file

@ -273,6 +273,8 @@ such as `{{ if .IsNamedParams }}...{{ else }}...{{ end }}`. See the
You can also use the variable `.Page` to access all the normal [Page Variables](/templates/variables/). You can also use the variable `.Page` to access all the normal [Page Variables](/templates/variables/).
A shortcodes can be nested. In a nested shortcode you can access the parent shortcode context with `.Parent`. This can be very useful for inheritance of common shortcode parameters from the root.
## Single Positional Example: youtube ## Single Positional Example: youtube
{{</* youtube 09jf3ow9jfw */>}} {{</* youtube 09jf3ow9jfw */>}}

9
hugolib/shortcode.go
View file

@ -34,6 +34,7 @@ type ShortcodeWithPage struct {
Params interface{} Params interface{}
Inner template.HTML Inner template.HTML
Page *Page Page *Page
Parent *ShortcodeWithPage
IsNamedParams bool IsNamedParams bool
} }
@ -189,7 +190,7 @@ const innerNewlineRegexp = "\n"
const innerCleanupRegexp = `\A<p>(.*)</p>\n\z` const innerCleanupRegexp = `\A<p>(.*)</p>\n\z`
const innerCleanupExpand = "$1" const innerCleanupExpand = "$1"
func renderShortcode(sc shortcode, p *Page, t tpl.Template) string { func renderShortcode(sc shortcode, parent *ShortcodeWithPage, p *Page, t tpl.Template) string {
tmpl := getShortcodeTemplate(sc.name, t) tmpl := getShortcodeTemplate(sc.name, t)
if tmpl == nil { if tmpl == nil {
@ -197,7 +198,7 @@ func renderShortcode(sc shortcode, p *Page, t tpl.Template) string {
return "" return ""
} }
data := &ShortcodeWithPage{Params: sc.params, Page: p} data := &ShortcodeWithPage{Params: sc.params, Page: p, Parent: parent}
if sc.params != nil { if sc.params != nil {
data.IsNamedParams = reflect.TypeOf(sc.params).Kind() == reflect.Map data.IsNamedParams = reflect.TypeOf(sc.params).Kind() == reflect.Map
} }
@ -209,7 +210,7 @@ func renderShortcode(sc shortcode, p *Page, t tpl.Template) string {
case string: case string:
inner += innerData.(string) inner += innerData.(string)
case shortcode: case shortcode:
inner += renderShortcode(innerData.(shortcode), p, t) inner += renderShortcode(innerData.(shortcode), data, p, t)
default: default:
jww.ERROR.Printf("Illegal state on shortcode rendering of '%s' in page %s. Illegal type in inner data: %s ", jww.ERROR.Printf("Illegal state on shortcode rendering of '%s' in page %s. Illegal type in inner data: %s ",
sc.name, p.BaseFileName(), reflect.TypeOf(innerData)) sc.name, p.BaseFileName(), reflect.TypeOf(innerData))
@ -271,7 +272,7 @@ func extractAndRenderShortcodes(stringToParse string, p *Page, t tpl.Template) (
// need to have something to replace with // need to have something to replace with
renderedShortcodes[key] = "" renderedShortcodes[key] = ""
} else { } else {
renderedShortcodes[key] = renderShortcode(sc, p, t) renderedShortcodes[key] = renderShortcode(sc, nil, p, t)
} }
} }

11
hugolib/shortcode_test.go
View file

@ -232,6 +232,17 @@ func TestNestedComplexSC(t *testing.T) {
"-row-1-s-col-2-<strong>s</strong>-aside-3-<strong>s</strong>-asideStop-4-s-colStop-5-s-rowStop-6-s", tem) "-row-1-s-col-2-<strong>s</strong>-aside-3-<strong>s</strong>-asideStop-4-s-colStop-5-s-rowStop-6-s", tem)
} }
func TestParentShortcode(t *testing.T) {
tem := tpl.New()
tem.AddInternalShortcode("r1.html", `1: {{ .Get "pr1" }} {{ .Inner }}`)
tem.AddInternalShortcode("r2.html", `2: {{ .Parent.Get "pr1" }}{{ .Get "pr2" }} {{ .Inner }}`)
tem.AddInternalShortcode("r3.html", `3: {{ .Parent.Parent.Get "pr1" }}{{ .Parent.Get "pr2" }}{{ .Get "pr3" }} {{ .Inner }}`)
CheckShortCodeMatch(t, `{{< r1 pr1="p1" >}}1: {{< r2 pr2="p2" >}}2: {{< r3 pr3="p3" >}}{{< /r3 >}}{{< /r2 >}}{{< /r1 >}}`,
"1: p1 1: 2: p1p2 2: 3: p1p2p3 ", tem)
}
func TestFigureImgWidth(t *testing.T) { func TestFigureImgWidth(t *testing.T) {
tem := tpl.New() tem := tpl.New()
CheckShortCodeMatch(t, `{{% figure src="/found/here" class="bananas orange" alt="apple" width="100px" %}}`, "\n<figure class=\"bananas orange\">\n \n <img src=\"/found/here\" alt=\"apple\" width=\"100px\" />\n \n \n</figure>\n", tem) CheckShortCodeMatch(t, `{{% figure src="/found/here" class="bananas orange" alt="apple" width="100px" %}}`, "\n<figure class=\"bananas orange\">\n \n <img src=\"/found/here\" alt=\"apple\" width=\"100px\" />\n \n \n</figure>\n", tem)