Skip to content

Commit 4feddd2

Browse files
committed
1. Added support of “Edge” JsRT version of Chakra JavaScript engine;
2. `ChakraJsRt` mode was renamed to `ChakraIeJsRt`.
1 parent c4b04d9 commit 4feddd2

File tree

76 files changed

+5925
-3257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+5925
-3257
lines changed

MsieJavaScriptEngine.Tests/B_ChakraJsRt/CommonTests.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

MsieJavaScriptEngine.Tests/B_ChakraJsRt/Es5Tests.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

MsieJavaScriptEngine.Tests/C_ChakraActiveScript/CommonTests.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

MsieJavaScriptEngine.Tests/C_ChakraActiveScript/Es5Tests.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

MsieJavaScriptEngine.Tests/D_Classic/CommonTests.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

MsieJavaScriptEngine.Tests/D_Classic/Es5Tests.cs

Lines changed: 0 additions & 60 deletions
This file was deleted.

MsieJavaScriptEngine.Tests/MsieJavaScriptEngine.Tests.csproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,20 @@
3939
<Reference Include="System.Core" />
4040
</ItemGroup>
4141
<ItemGroup>
42-
<Compile Include="C_ChakraActiveScript\CommonTests.cs">
42+
<Compile Include="B_ChakraEdgeJsRt\CommonTests.cs" />
43+
<Compile Include="B_ChakraEdgeJsRt\Es5Tests.cs" />
44+
<Compile Include="D_ChakraActiveScript\CommonTests.cs">
4345
<SubType>Code</SubType>
4446
</Compile>
45-
<Compile Include="C_ChakraActiveScript\Es5Tests.cs">
47+
<Compile Include="D_ChakraActiveScript\Es5Tests.cs">
4648
<SubType>Code</SubType>
4749
</Compile>
48-
<Compile Include="B_ChakraJsRt\CommonTests.cs" />
49-
<Compile Include="B_ChakraJsRt\Es5Tests.cs" />
50-
<Compile Include="D_Classic\CommonTests.cs">
50+
<Compile Include="C_ChakraIeJsRt\CommonTests.cs" />
51+
<Compile Include="C_ChakraIeJsRt\Es5Tests.cs" />
52+
<Compile Include="E_Classic\CommonTests.cs">
5153
<SubType>Code</SubType>
5254
</Compile>
53-
<Compile Include="D_Classic\Es5Tests.cs">
55+
<Compile Include="E_Classic\Es5Tests.cs">
5456
<SubType>Code</SubType>
5557
</Compile>
5658
<Compile Include="CommonTestsBase.cs" />

MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected ActiveScriptJsEngineBase(string clsid, string engineModeName, string l
7979
catch (Exception e)
8080
{
8181
throw new JsEngineLoadException(
82-
string.Format(Strings.Runtime_JsEngineNotLoaded,
82+
string.Format(Strings.Runtime_IeJsEngineNotLoaded,
8383
_engineModeName, lowerIeVersion, e.Message), _engineModeName);
8484
}
8585

MsieJavaScriptEngine/Constants/JsEngineModeName.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ internal static class JsEngineModeName
1616
public const string ChakraActiveScript = "Chakra ActiveScript";
1717

1818
/// <summary>
19-
/// Name of Chakra JsRT mode
19+
/// Name of Chakra “Legacy” JsRT mode
2020
/// </summary>
21-
public const string ChakraJsRt = "Chakra JsRT";
21+
public const string ChakraIeJsRt = "Chakra IE JsRT";
22+
23+
/// <summary>
24+
/// Name of Chakra “Edge” JsRT mode
25+
/// </summary>
26+
public const string ChakraEdgeJsRt = "Chakra Edge JsRT";
2227
}
2328
}

MsieJavaScriptEngine/JsEngineMode.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,15 @@ public enum JsEngineMode
2424
ChakraActiveScript,
2525

2626
/// <summary>
27-
/// JsRT version of Chakra JavaScript engine (supports ECMAScript 5).
27+
/// “Legacy” JsRT version of Chakra JavaScript engine (supports ECMAScript 5).
2828
/// Requires Internet Explorer 11 or higher on the machine.
2929
/// </summary>
30-
ChakraJsRt
30+
ChakraIeJsRt,
31+
32+
/// <summary>
33+
/// “Edge” JsRT version of Chakra JavaScript engine (supports ECMAScript 5).
34+
/// Requires Microsoft Edge on the machine.
35+
/// </summary>
36+
ChakraEdgeJsRt
3137
}
3238
}

0 commit comments

Comments
 (0)