-Added StringEscapeHandling with options to escape HTML and non-ASCII characters

-Added feature to deserialize ISet<T> properties as HashSet<T>
-Fixed ReferenceLoopHandling not being used when serializing ISerializable and dynamic values
This commit is contained in:
James Newton-King
2012-11-18 14:36:00 +13:00
parent f7018719d4
commit e3be3e43db
22 changed files with 515 additions and 38 deletions
+13 -2
View File
@@ -206,11 +206,22 @@ namespace Newtonsoft.Json
{
InternalWritePropertyName(name);
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, name, _quoteChar, _quoteName);
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, name, _quoteChar, _quoteName, GetCharEscapeFlags(), StringEscapeHandling);
_writer.Write(':');
}
private bool[] GetCharEscapeFlags()
{
if (StringEscapeHandling == StringEscapeHandling.EscapeHtml)
return JavaScriptUtils.HtmlCharEscapeFlags;
if (_quoteChar == '"')
return JavaScriptUtils.DoubleQuoteCharEscapeFlags;
return JavaScriptUtils.SingleQuoteCharEscapeFlags;
}
/// <summary>
/// Writes indent characters.
/// </summary>
@@ -294,7 +305,7 @@ namespace Newtonsoft.Json
if (value == null)
WriteValueInternal(JsonConvert.Null, JsonToken.Null);
else
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, value, _quoteChar, true);
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, value, _quoteChar, true, GetCharEscapeFlags(), StringEscapeHandling);
}
/// <summary>