lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 19:30:55 +00:00
Code Issues Releases Activity

Merge pull request #2045 from Maxgis/master

Browse Source 
avoid  error when the  callback function not exisit
This commit is contained in:
astaxie 2016-08-02 09:50:52 +08:00 committed by GitHub
commit ce6d673933
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
context/output.go
View File

@ -212,7 +212,8 @@ func (output *BeegoOutput) JSONP(data interface{}, hasIndent bool) error {
if callback == "" { if callback == "" {
return errors.New(`"callback" parameter required`) return errors.New(`"callback" parameter required`)
} }
callbackContent := bytes.NewBufferString(" " + template.JSEscapeString(callback)) callback = template.JSEscapeString(callback)
callbackContent := bytes.NewBufferString(" if(window." + callback + ")" + callback)
callbackContent.WriteString("(") callbackContent.WriteString("(")
callbackContent.Write(content) callbackContent.Write(content)
callbackContent.WriteString(");\r\n") callbackContent.WriteString(");\r\n")