Skip to content

Commit 8847db8

Browse files
TaritsynTaritsyn
committed
Version 1.2.6:
1. In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 1.5.3; 2. In JavaScriptEngineSwitcher.V8 fixed a bug #12 “V8 config can be null”; 3. In JavaScriptEngineSwitcher.Jint added support of Jint version of April 30, 2015.
1 parent 0bd5f40 commit 8847db8

File tree

20 files changed

+64
-57
lines changed

20 files changed

+64
-57
lines changed

‎Binaries/Jint/Jint.dll

1 KB
Binary file not shown.

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Change log
22
==========
33

4+
## May 5, 2015 - v1.2.6
5+
* In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 1.5.3
6+
* In JavaScriptEngineSwitcher.V8 fixed a [bug #12](http://github.com/Taritsyn/JavaScriptEngineSwitcher/issues/12) “V8 config can be null”
7+
* In JavaScriptEngineSwitcher.Jint added support of Jint version of April 30, 2015
8+
49
## April 5, 2015 - v1.2.5
510
* In JavaScriptEngineSwitcher.ConfigurationIntelliSense updated definitions for configuration settings of Jint JavaScript engine
611
* In JavaScriptEngineSwitcher.Msie added support of MSIE JavaScript Engine version 1.5.2

‎JavaScriptEngineSwitcher.Jint/JintJsEngine.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public sealed class JintJsEngine : JsEngineBase
3131
/// <summary>
3232
/// Version of original JavaScript engine
3333
/// </summary>
34-
private const string ENGINE_VERSION = "Mar 29, 2015";
34+
private const string ENGINE_VERSION = "Apr 30, 2015";
3535

3636
/// <summary>
3737
/// Jint JS engine
@@ -56,21 +56,23 @@ public override string Version
5656

5757

5858
/// <summary>
59-
/// Constructs instance of adapter for Jint
59+
/// Constructs a instance of adapter for Jint
6060
/// </summary>
6161
public JintJsEngine()
6262
: this(JsEngineSwitcher.Current.GetJintConfiguration())
6363
{ }
6464

6565
/// <summary>
66-
/// Constructs instance of adapter for Jint
66+
/// Constructs a instance of adapter for Jint
6767
/// </summary>
68-
/// <param name="jintConfig">Configuration settings of Jint JavaScript engine</param>
69-
public JintJsEngine(JintConfiguration jintConfig)
68+
/// <param name="config">Configuration settings of Jint JavaScript engine</param>
69+
public JintJsEngine(JintConfiguration config)
7070
{
71+
JintConfiguration jintConfig = config ?? new JintConfiguration();
72+
7173
try
7274
{
73-
_jsEngine = new OriginalJsEngine(config => config
75+
_jsEngine = new OriginalJsEngine(c => c
7476
.AllowDebuggerStatement(jintConfig.EnableDebugging)
7577
.LimitRecursion(jintConfig.MaxRecursionDepth)
7678
.MaxStatements(jintConfig.MaxStatements)

‎JavaScriptEngineSwitcher.Jint/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("4b51319e-014f-4731-8a80-15b5c58f3a72")]
1515

16-
[assembly: AssemblyVersion("1.2.5.0")]
17-
[assembly: AssemblyFileVersion("1.2.5.0")]
16+
[assembly: AssemblyVersion("1.2.6.0")]
17+
[assembly: AssemblyFileVersion("1.2.6.0")]

‎JavaScriptEngineSwitcher.Jurassic/JurassicJsEngine.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,20 @@ public override string Version
5555

5656

5757
/// <summary>
58-
/// Constructs instance of adapter for Jurassic
58+
/// Constructs a instance of adapter for Jurassic
5959
/// </summary>
6060
public JurassicJsEngine()
6161
: this(JsEngineSwitcher.Current.GetJurassicConfiguration())
6262
{ }
6363

6464
/// <summary>
65-
/// Constructs instance of adapter for Jurassic
65+
/// Constructs a instance of adapter for Jurassic
6666
/// </summary>
67-
/// <param name="jurassicConfig">Configuration settings of Jurassic JavaScript engine</param>
68-
public JurassicJsEngine(JurassicConfiguration jurassicConfig)
67+
/// <param name="config">Configuration settings of Jurassic JavaScript engine</param>
68+
public JurassicJsEngine(JurassicConfiguration config)
6969
{
70+
JurassicConfiguration jurassicConfig = config ?? new JurassicConfiguration();
71+
7072
try
7173
{
7274
_jsEngine = new OriginalJsEngine

‎JavaScriptEngineSwitcher.Jurassic/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("1e4eb77e-0771-4109-832f-20e3475315ed")]
1515

16-
[assembly: AssemblyVersion("1.2.4.0")]
17-
[assembly: AssemblyFileVersion("1.2.4.0")]
16+
[assembly: AssemblyVersion("1.2.6.0")]
17+
[assembly: AssemblyFileVersion("1.2.6.0")]

‎JavaScriptEngineSwitcher.Msie/JavaScriptEngineSwitcher.Msie.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
<AssemblyOriginatorKeyFile>..\JavaScriptEngineSwitcher.snk</AssemblyOriginatorKeyFile>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="MsieJavaScriptEngine, Version=1.5.2.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
42+
<Reference Include="MsieJavaScriptEngine, Version=1.5.3.0, Culture=neutral, PublicKeyToken=a3a2846a37ac0d3e, processorArchitecture=MSIL">
4343
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\packages\MsieJavaScriptEngine.1.5.2\lib\net40\MsieJavaScriptEngine.dll</HintPath>
44+
<HintPath>..\packages\MsieJavaScriptEngine.1.5.3\lib\net40\MsieJavaScriptEngine.dll</HintPath>
4545
</Reference>
4646
<Reference Include="System" />
4747
<Reference Include="System.configuration" />

‎JavaScriptEngineSwitcher.Msie/MsieJsEngine.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,20 @@ public override string Version
5353

5454

5555
/// <summary>
56-
/// Constructs instance of adapter for MSIE JavaScript engine
56+
/// Constructs a instance of adapter for MSIE JavaScript engine
5757
/// </summary>
5858
public MsieJsEngine()
5959
: this(JsEngineSwitcher.Current.GetMsieConfiguration())
6060
{ }
6161

6262
/// <summary>
63-
/// Constructs instance of adapter for MSIE JavaScript engine
63+
/// Constructs a instance of adapter for MSIE JavaScript engine
6464
/// </summary>
65-
/// <param name="msieConfig">Configuration settings of MSIE JavaScript engine</param>
66-
public MsieJsEngine(MsieConfiguration msieConfig)
65+
/// <param name="config">Configuration settings of MSIE JavaScript engine</param>
66+
public MsieJsEngine(MsieConfiguration config)
6767
{
68+
MsieConfiguration msieConfig = config ?? new MsieConfiguration();
69+
6870
OriginalJsEngineMode engineMode =
6971
Utils.GetEnumFromOtherEnum<JsEngineMode, OriginalJsEngineMode>(msieConfig.EngineMode);
7072

‎JavaScriptEngineSwitcher.Msie/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("1c5512ac-5d2f-45dc-92d4-725624a0016c")]
1515

16-
[assembly: AssemblyVersion("1.2.5.0")]
17-
[assembly: AssemblyFileVersion("1.2.5.0")]
16+
[assembly: AssemblyVersion("1.2.6.0")]
17+
[assembly: AssemblyFileVersion("1.2.6.0")]

‎JavaScriptEngineSwitcher.Msie/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="MsieJavaScriptEngine" version="1.5.2" targetFramework="net40-Client" />
3+
<package id="MsieJavaScriptEngine" version="1.5.3" targetFramework="net40-Client" />
44
</packages>

0 commit comments

Comments
 (0)