summaryrefslogtreecommitdiffstats
path: root/tpl/encoding
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-11-02 19:03:48 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-11-02 19:03:48 +0100
commit4f3c0959635776278f5cc6ab7e5e262fdd3e1219 (patch)
tree9e805a9144174c9f82bd53496739e083a4a3452c /tpl/encoding
parent486bc46a5217a9d70fe0d14ab9261d7b4eb026d6 (diff)
Revert "tpl: Update Jsonify to return pretty-print output"
This reverts commit 5a52cd5f920bb3d067ab1682adece9f813c67ba1. Closes #5394
Diffstat (limited to 'tpl/encoding')
-rw-r--r--tpl/encoding/encoding.go4
-rw-r--r--tpl/encoding/encoding_test.go2
-rw-r--r--tpl/encoding/init.go2
3 files changed, 4 insertions, 4 deletions
diff --git a/tpl/encoding/encoding.go b/tpl/encoding/encoding.go
index d9c2bdfd6..4b02c426a 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 fdb12e349..8242561b6 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 902a2b003..bad1804de 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"]`},
},
)