Skip to content

Commit 6b5b1ec

Browse files
committed
Version 1.1.0
1 parent 2ccb65f commit 6b5b1ec

File tree

10 files changed

+527
-6
lines changed

10 files changed

+527
-6
lines changed

MsieJavaScriptEngine.Tests/MsieJsEngineTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class MsieJsEngineTests
1111
[TestFixtureSetUp]
1212
public void SetUp()
1313
{
14-
_msieJsEngine = new MsieJsEngine(true);
14+
_msieJsEngine = new MsieJsEngine(true, true);
1515
}
1616

1717
[Test]

MsieJavaScriptEngine/MsieJavaScriptEngine.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
<ItemGroup>
8181
<Content Include="Resources\ES5.js" />
8282
<EmbeddedResource Include="Resources\ES5.min.js" />
83+
<Content Include="Resources\json2.js" />
84+
<EmbeddedResource Include="Resources\json2.min.js" />
8385
<Content Include="Resources\msieJavaScriptEngine.js" />
8486
<EmbeddedResource Include="Resources\msieJavaScriptEngine.min.js" />
8587
</ItemGroup>
@@ -100,6 +102,7 @@
100102
<PreBuildEvent>cd "$(ProjectDir)..\Binaries\MicrosoftAjaxMinifier\"
101103

102104
ajaxmin.exe "$(ProjectDir)Resources\ES5.js" –out "$(ProjectDir)Resources\ES5.min.js" –clobber
105+
ajaxmin.exe "$(ProjectDir)Resources\json2.js" –out "$(ProjectDir)Resources\json2.min.js" –clobber
103106
ajaxmin.exe "$(ProjectDir)Resources\msieJavaScriptEngine.js" –out "$(ProjectDir)Resources\msieJavaScriptEngine.min.js" –clobber</PreBuildEvent>
104107
</PropertyGroup>
105108
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

MsieJavaScriptEngine/MsieJsEngine.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ public sealed class MsieJsEngine : IDisposable
2121
/// </summary>
2222
const string ES5_POLYFILL_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.ES5.min.js";
2323

24+
/// <summary>
25+
/// Name of resource, which contains a JSON2 library
26+
/// </summary>
27+
const string JSON2_LIBRARY_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.json2.min.js";
28+
2429
/// <summary>
2530
/// Name of resource, which contains a MsieJavaScript library
2631
/// </summary>
@@ -104,7 +109,16 @@ public MsieJsEngine() : this(false)
104109
/// Constructs instance of MSIE JS-engine
105110
/// </summary>
106111
/// <param name="useEcmaScript5Polyfill">Flag for whether to use the ECMAScript 5 Polyfill</param>
107-
public MsieJsEngine(bool useEcmaScript5Polyfill)
112+
public MsieJsEngine(bool useEcmaScript5Polyfill)
113+
: this(useEcmaScript5Polyfill, false)
114+
{ }
115+
116+
/// <summary>
117+
/// Constructs instance of MSIE JS-engine
118+
/// </summary>
119+
/// <param name="useEcmaScript5Polyfill">Flag for whether to use the ECMAScript 5 Polyfill</param>
120+
/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
121+
public MsieJsEngine(bool useEcmaScript5Polyfill, bool useJson2Library)
108122
{
109123
_activeScriptSite = new ActiveScriptSite();
110124
_jsSerializer = new JavaScriptSerializer();
@@ -115,6 +129,12 @@ public MsieJsEngine(bool useEcmaScript5Polyfill)
115129
{
116130
ExecuteResource(ES5_POLYFILL_RESOURCE_NAME, type);
117131
}
132+
133+
if (useJson2Library)
134+
{
135+
ExecuteResource(JSON2_LIBRARY_RESOURCE_NAME, type);
136+
}
137+
118138
ExecuteResource(MSIE_JAVASCRIPT_LIBRARY_RESOURCE_NAME, type);
119139
}
120140

MsieJavaScriptEngine/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.0.8.0")]
35-
[assembly: AssemblyFileVersion("1.0.8.0")]
34+
[assembly: AssemblyVersion("1.1.0.0")]
35+
[assembly: AssemblyFileVersion("1.1.0.0")]

0 commit comments

Comments
 (0)