Skip to content

Commit 3bc5e04

Browse files
committed
Version 1.5.5:
1. Fixed an error, that occurs on computers with IE 6; 2. Removed `Obsolete` attribute from parameterless constructor.
1 parent 0c9e6cc commit 3bc5e04

File tree

7 files changed

+26
-21
lines changed

7 files changed

+26
-21
lines changed

MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,19 @@ protected ActiveScriptJsEngineBase(string clsid, string engineModeName, string l
8383
_engineModeName, lowerIeVersion, e.Message), _engineModeName);
8484
}
8585

86-
var activeScriptProperty = _activeScript as IActiveScriptProperty;
87-
if (activeScriptProperty != null)
86+
if (languageVersion != ScriptLanguageVersion.None)
8887
{
89-
object scriptLanguageVersion = (int)languageVersion;
90-
uint result = activeScriptProperty.SetProperty((uint)ScriptProperty.InvokeVersioning,
91-
IntPtr.Zero, ref scriptLanguageVersion);
92-
if (result != (uint)ScriptHResult.Ok)
88+
var activeScriptProperty = _activeScript as IActiveScriptProperty;
89+
if (activeScriptProperty != null)
9390
{
94-
throw new JsEngineLoadException(
95-
string.Format(Strings.Runtime_ActiveScriptLanguageVersionSelectionFailed, languageVersion));
91+
object scriptLanguageVersion = (int) languageVersion;
92+
uint result = activeScriptProperty.SetProperty((uint) ScriptProperty.InvokeVersioning,
93+
IntPtr.Zero, ref scriptLanguageVersion);
94+
if (result != (uint) ScriptHResult.Ok)
95+
{
96+
throw new JsEngineLoadException(
97+
string.Format(Strings.Runtime_ActiveScriptLanguageVersionSelectionFailed, languageVersion));
98+
}
9699
}
97100
}
98101

MsieJavaScriptEngine/ActiveScript/ClassicActiveScriptJsEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ internal sealed class ClassicActiveScriptJsEngine : ActiveScriptJsEngineBase
1717
/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
1818
public ClassicActiveScriptJsEngine(bool useEcmaScript5Polyfill, bool useJson2Library)
1919
: base(CLASSIC_CLSID, JsEngineModeName.Classic, "6",
20-
ScriptLanguageVersion.Default, useEcmaScript5Polyfill, useJson2Library)
20+
ScriptLanguageVersion.None, useEcmaScript5Polyfill, useJson2Library)
2121
{ }
2222

2323

MsieJavaScriptEngine/ActiveScript/ScriptLanguageVersion.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
internal enum ScriptLanguageVersion
77
{
88
/// <summary>
9-
/// The default version
9+
/// Version not selected
10+
/// </summary>
11+
None = -1,
12+
13+
/// <summary>
14+
/// Default version
1015
/// </summary>
1116
Default = 0,
1217

MsieJavaScriptEngine/MsieJsEngine.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public string Mode
3939
/// </summary>
4040
/// <exception cref="MsieJavaScriptEngine.JsEngineLoadException">Failed to load a JavaScript engine.</exception>
4141
/// <exception cref="System.NotSupportedException">Selected mode of JavaScript engine is not supported.</exception>
42-
[Obsolete]
4342
public MsieJsEngine()
4443
: this(new JsEngineSettings())
4544
{ }

MsieJavaScriptEngine/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: ComVisible(false)]
1414
[assembly: Guid("ae6911c9-e2a9-4386-ab90-3722a9166564")]
1515

16-
[assembly: AssemblyVersion("1.5.4.0")]
17-
[assembly: AssemblyFileVersion("1.5.4.0")]
16+
[assembly: AssemblyVersion("1.5.5.0")]
17+
[assembly: AssemblyFileVersion("1.5.5.0")]
1818

1919
[module: DefaultCharSet(CharSet.Unicode)]

NuGet/MsieJavaScriptEngine.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>MsieJavaScriptEngine</id>
5-
<version>1.5.4</version>
5+
<version>1.5.5</version>
66
<title>MSIE JavaScript Engine for .NET</title>
77
<authors>Andrey Taritsyn</authors>
88
<owners>Andrey Taritsyn</owners>
@@ -12,8 +12,8 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine). Project was based on the code of SassAndCoffee.JavaScript (http://github.com/paulcbetts/SassAndCoffee) and Chakra Sample Hosts (http://github.com/panopticoncentral/chakra-host).</description>
1414
<summary>This project is a .NET wrapper for working with the Internet Explorer's JavaScript engines (JsRT version of Chakra, ActiveScript version of Chakra and Classic JavaScript Engine).</summary>
15-
<releaseNotes>1. In `ChakraActiveScript` mode added native support of ECMAScript 5 (without polyfills);
16-
2. Added `JsEngineSettings` class for any reason in the future to abandon redundant constructors.</releaseNotes>
15+
<releaseNotes>1. Fixed an error, that occurs on computers with IE 6;
16+
2. Removed `Obsolete` attribute from parameterless constructor.</releaseNotes>
1717
<copyright>Copyright (c) 2012-2015 Andrey Taritsyn - http://www.taritsyn.ru</copyright>
1818
<language>en-US</language>
1919
<tags>JavaScript ECMAScript MSIE IE Chakra</tags>

NuGet/readme.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
----------------------------------------------------------------------
4-
README file for MSIE JavaScript Engine for .NET 1.5.4
4+
README file for MSIE JavaScript Engine for .NET 1.5.5
55

66
----------------------------------------------------------------------
77

@@ -21,10 +21,8 @@
2121
=============
2222
RELEASE NOTES
2323
=============
24-
1. In `ChakraActiveScript` mode added native support of ECMAScript 5
25-
(without polyfills);
26-
2. Added `JsEngineSettings` class for any reason in the future to
27-
abandon redundant constructors.
24+
1. Fixed an error, that occurs on computers with IE 6;
25+
2. Removed `Obsolete` attribute from parameterless constructor.
2826

2927
============
3028
PROJECT SITE

0 commit comments

Comments
 (0)