diff options
Diffstat (limited to 'vendor/github.com/gin-gonic/gin/render/json.go')
-rw-r--r-- | vendor/github.com/gin-gonic/gin/render/json.go | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vendor/github.com/gin-gonic/gin/render/json.go b/vendor/github.com/gin-gonic/gin/render/json.go index 3ebcee970..418630939 100644 --- a/vendor/github.com/gin-gonic/gin/render/json.go +++ b/vendor/github.com/gin-gonic/gin/render/json.go @@ -46,11 +46,9 @@ type PureJSON struct { Data interface{} } -var ( - jsonContentType = []string{"application/json; charset=utf-8"} - jsonpContentType = []string{"application/javascript; charset=utf-8"} - jsonASCIIContentType = []string{"application/json"} -) +var jsonContentType = []string{"application/json; charset=utf-8"} +var jsonpContentType = []string{"application/javascript; charset=utf-8"} +var jsonAsciiContentType = []string{"application/json"} // Render (JSON) writes data with custom ContentType. func (r JSON) Render(w http.ResponseWriter) (err error) { @@ -102,7 +100,8 @@ func (r SecureJSON) Render(w http.ResponseWriter) error { // if the jsonBytes is array values if bytes.HasPrefix(jsonBytes, bytesconv.StringToBytes("[")) && bytes.HasSuffix(jsonBytes, bytesconv.StringToBytes("]")) { - if _, err = w.Write(bytesconv.StringToBytes(r.Prefix)); err != nil { + _, err = w.Write(bytesconv.StringToBytes(r.Prefix)) + if err != nil { return err } } @@ -129,19 +128,20 @@ func (r JsonpJSON) Render(w http.ResponseWriter) (err error) { } callback := template.JSEscapeString(r.Callback) - if _, err = w.Write(bytesconv.StringToBytes(callback)); err != nil { + _, err = w.Write(bytesconv.StringToBytes(callback)) + if err != nil { return err } - - if _, err = w.Write(bytesconv.StringToBytes("(")); err != nil { + _, err = w.Write(bytesconv.StringToBytes("(")) + if err != nil { return err } - - if _, err = w.Write(ret); err != nil { + _, err = w.Write(ret) + if err != nil { return err } - - if _, err = w.Write(bytesconv.StringToBytes(");")); err != nil { + _, err = w.Write(bytesconv.StringToBytes(");")) + if err != nil { return err } @@ -176,7 +176,7 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) { // WriteContentType (AsciiJSON) writes JSON ContentType. func (r AsciiJSON) WriteContentType(w http.ResponseWriter) { - writeContentType(w, jsonASCIIContentType) + writeContentType(w, jsonAsciiContentType) } // Render (PureJSON) writes custom ContentType and encodes the given interface object. |