hugo

commit 4f3c0959635776278f5cc6ab7e5e262fdd3e1219
parent 486bc46a5217a9d70fe0d14ab9261d7b4eb026d6
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Fri,  2 Nov 2018 19:03:48 +0100

Revert "tpl: Update Jsonify to return pretty-print output"

This reverts commit 5a52cd5f920bb3d067ab1682adece9f813c67ba1.

Closes #5394

Diffstat:
M
docs/content/en/functions/jsonify.md
 | 
2
+-
M
tpl/encoding/encoding.go
 | 
4
++--
M
tpl/encoding/encoding_test.go
 | 
2
+-
M
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
@@ -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
@@ -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
@@ -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
@@ -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"]`},
 			},
 		)