From 4f3c0959635776278f5cc6ab7e5e262fdd3e1219 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 2 Nov 2018 19:03:48 +0100 Subject: [PATCH] Revert "tpl: Update Jsonify to return pretty-print output" This reverts commit 5a52cd5f920bb3d067ab1682adece9f813c67ba1. Closes #5394 --- docs/content/en/functions/jsonify.md | 2 +- tpl/encoding/encoding.go | 4 ++-- tpl/encoding/encoding_test.go | 2 +- tpl/encoding/init.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/content/en/functions/jsonify.md b/docs/content/en/functions/jsonify.md index 98ad3c78..5c670244 100644 --- a/docs/content/en/functions/jsonify.md +++ b/docs/content/en/functions/jsonify.md @@ -1,7 +1,7 @@ --- title: jsonify linktitle: jsonify -description: Encodes a given object to JSON, returning pretty printed output. +description: Encodes a given object to JSON. godocref: date: 2017-02-01 publishdate: 2017-02-01 diff --git a/tpl/encoding/encoding.go b/tpl/encoding/encoding.go index d9c2bdfd..4b02c426 100644 --- a/tpl/encoding/encoding.go +++ b/tpl/encoding/encoding.go @@ -50,9 +50,9 @@ func (ns *Namespace) Base64Encode(content interface{}) (string, error) { return base64.StdEncoding.EncodeToString([]byte(conv)), nil } -// Jsonify encodes a given object to JSON, returning pretty printed output. +// Jsonify encodes a given object to JSON. func (ns *Namespace) Jsonify(v interface{}) (template.HTML, error) { - b, err := json.MarshalIndent(v, "", " ") + b, err := json.Marshal(v) if err != nil { return "", err } diff --git a/tpl/encoding/encoding_test.go b/tpl/encoding/encoding_test.go index fdb12e34..8242561b 100644 --- a/tpl/encoding/encoding_test.go +++ b/tpl/encoding/encoding_test.go @@ -88,7 +88,7 @@ func TestJsonify(t *testing.T) { v interface{} expect interface{} }{ - {[]string{"a", "b"}, template.HTML("[\n \"a\",\n \"b\"\n]")}, + {[]string{"a", "b"}, template.HTML(`["a","b"]`)}, {tstNoStringer{}, template.HTML("{}")}, {nil, template.HTML("null")}, // errors diff --git a/tpl/encoding/init.go b/tpl/encoding/init.go index 902a2b00..bad1804d 100644 --- a/tpl/encoding/init.go +++ b/tpl/encoding/init.go @@ -47,7 +47,7 @@ func init() { ns.AddMethodMapping(ctx.Jsonify, []string{"jsonify"}, [][2]string{ - {`{{ (slice "A" "B" "C") | jsonify }}`, "[\n \"A\",\n \"B\",\n \"C\"\n]"}, + {`{{ (slice "A" "B" "C") | jsonify }}`, `["A","B","C"]`}, }, ) -- 2.30.2