Commit a5b5ae89 authored by Francois's avatar Francois

Update template.go

We can specify "TemplateLeft" and "TemplateRight" but they did not work as these two changes are required.
parent ac6108a8
...@@ -153,7 +153,7 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp ...@@ -153,7 +153,7 @@ func getTplDeep(root, file, parent string, t *template.Template) (*template.Temp
if err != nil { if err != nil {
return nil, [][]string{}, err return nil, [][]string{}, err
} }
reg := regexp.MustCompile("{{[ ]*template[ ]+\"([^\"]+)\"") reg := regexp.MustCompile(TemplateLeft + "[ ]*template[ ]+\"([^\"]+)\"")
allsub := reg.FindAllStringSubmatch(string(data), -1) allsub := reg.FindAllStringSubmatch(string(data), -1)
for _, m := range allsub { for _, m := range allsub {
if len(m) == 2 { if len(m) == 2 {
...@@ -216,7 +216,7 @@ func _getTemplate(t0 *template.Template, root string, submods [][]string, others ...@@ -216,7 +216,7 @@ func _getTemplate(t0 *template.Template, root string, submods [][]string, others
if err != nil { if err != nil {
continue continue
} }
reg := regexp.MustCompile("{{[ ]*define[ ]+\"([^\"]+)\"") reg := regexp.MustCompile(TemplateLeft + "[ ]*define[ ]+\"([^\"]+)\"")
allsub := reg.FindAllStringSubmatch(string(data), -1) allsub := reg.FindAllStringSubmatch(string(data), -1)
for _, sub := range allsub { for _, sub := range allsub {
if len(sub) == 2 && sub[1] == m[1] { if len(sub) == 2 && sub[1] == m[1] {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment