Changed as per request

notzippy · notzippy · commit 6dd3fbfbf0ba · 2017-06-06T10:21:32.000-07:00
diff --git a/revel.go b/revel.go
@@ -25,9 +25,9 @@ const (
 )
 const (
 	// Called when templates are going to be refreshed (receivers are registered template engines added to the template.engine conf option)
-	TEMPLATE_REFRESH = iota
+	TEMPLATE_REFRESH_REQUESTED = iota
 	// Called when templates are refreshed (receivers are registered template engines added to the template.engine conf option)
-	TEMPLATE_REFRESH_COMPLETE
+	TEMPLATE_REFRESH_COMPLETED
 
 )
 type revelLogs struct {
diff --git a/template.go b/template.go
@@ -72,14 +72,14 @@ func (loader *TemplateLoader) Refresh() (err *Error) {
 		}
 	}
 	for _, engine := range loader.templatesAndEngineList {
-		engine.Event(TEMPLATE_REFRESH, nil)
+		engine.Event(TEMPLATE_REFRESH_REQUESTED, nil)
 	}
-	fireEvent(TEMPLATE_REFRESH, nil)
+	fireEvent(TEMPLATE_REFRESH_REQUESTED, nil)
 	defer func() {
 		for _, engine := range loader.templatesAndEngineList {
-			engine.Event(TEMPLATE_REFRESH_COMPLETE, nil)
+			engine.Event(TEMPLATE_REFRESH_COMPLETED, nil)
 		}
-		fireEvent(TEMPLATE_REFRESH_COMPLETE, nil)
+		fireEvent(TEMPLATE_REFRESH_COMPLETED, nil)
 		// Reset the TemplateMap, we don't prepopulate the map because
 		loader.TemplateMap = map[string]Template{}
 
diff --git a/template_adapter_go.go b/template_adapter_go.go
@@ -256,7 +256,7 @@ func (engine *GoEngine) Name() string {
 	return GO_TEMPLATE
 }
 func (engine *GoEngine) Event(action int, i interface{}) {
-	if action == TEMPLATE_REFRESH {
+	if action == TEMPLATE_REFRESH_REQUESTED {
 		// At this point all the templates have been passed into the
 		engine.templatesBylowerName = map[string]*GoTemplate{}
 		engine.templateSet = template.New("__root__").Funcs(TemplateFuncs)

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@ const (`
`25`	`25`	`)`
`26`	`26`	`const (`
`27`	`27`	`// Called when templates are going to be refreshed (receivers are registered template engines added to the template.engine conf option)`
`28`		`- TEMPLATE_REFRESH = iota`
	`28`	`+ TEMPLATE_REFRESH_REQUESTED = iota`
`29`	`29`	`// Called when templates are refreshed (receivers are registered template engines added to the template.engine conf option)`
`30`		`- TEMPLATE_REFRESH_COMPLETE`
	`30`	`+ TEMPLATE_REFRESH_COMPLETED`
`31`	`31`
`32`	`32`	`)`
`33`	`33`	`type revelLogs struct {`
Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,14 @@ func (loader TemplateLoader) Refresh() (err Error) {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`for _, engine := range loader.templatesAndEngineList {`
`75`		`- engine.Event(TEMPLATE_REFRESH, nil)`
	`75`	`+ engine.Event(TEMPLATE_REFRESH_REQUESTED, nil)`
`76`	`76`	`}`
`77`		`- fireEvent(TEMPLATE_REFRESH, nil)`
	`77`	`+ fireEvent(TEMPLATE_REFRESH_REQUESTED, nil)`
`78`	`78`	`defer func() {`
`79`	`79`	`for _, engine := range loader.templatesAndEngineList {`
`80`		`- engine.Event(TEMPLATE_REFRESH_COMPLETE, nil)`
	`80`	`+ engine.Event(TEMPLATE_REFRESH_COMPLETED, nil)`
`81`	`81`	`}`
`82`		`- fireEvent(TEMPLATE_REFRESH_COMPLETE, nil)`
	`82`	`+ fireEvent(TEMPLATE_REFRESH_COMPLETED, nil)`
`83`	`83`	`// Reset the TemplateMap, we don't prepopulate the map because`
`84`	`84`	`loader.TemplateMap = map[string]Template{}`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func (engine *GoEngine) Name() string {`
`256`	`256`	`return GO_TEMPLATE`
`257`	`257`	`}`
`258`	`258`	`func (engine *GoEngine) Event(action int, i interface{}) {`
`259`		`- if action == TEMPLATE_REFRESH {`
	`259`	`+ if action == TEMPLATE_REFRESH_REQUESTED {`
`260`	`260`	`// At this point all the templates have been passed into the`
`261`	`261`	`engine.templatesBylowerName = map[string]*GoTemplate{}`
`262`	`262`	`engine.templateSet = template.New("__root__").Funcs(TemplateFuncs)`