Skip to content

Commit f42dcbd

Browse files
committed
Update escape option to be more consistent in naming
1 parent 543d557 commit f42dcbd

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

lib/encode.ex

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@ defmodule Jason.Encode do
4949
defp escape_function(%{escape: escape}) do
5050
case escape do
5151
:json -> &escape_json/4
52-
:unicode -> &escape_unicode/4
5352
:html_safe -> &escape_html/4
53+
:unicode_safe -> &escape_unicode/4
54+
:javascript_safe -> &escape_javascript/4
55+
# Keep for compatibility with Poison
5456
:javascript -> &escape_javascript/4
57+
:unicode -> &escape_unicode/4
5558
end
5659
end
5760

lib/jason.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ defmodule Jason do
33
A blazing fast JSON parser and generator in pure Elixir.
44
"""
55

6-
@type escape :: :json | :unicode | :html | :javascript
6+
@type escape :: :json | :unicode_safe | :html_safe | :javascript_safe
77
@type maps :: :naive | :strict
88

99
@type encode_opt :: {:escape, escape} | {:maps, maps}

0 commit comments

Comments
 (0)