Was made refactoring

Author: Taritsyn

src/MsieJavaScriptEngine/ActiveScript/ActiveScriptJsEngineBase.cs

@@ -19,6 +19,16 @@ namespace MsieJavaScriptEngine.ActiveScript
 	/// </summary>
 	internal abstract partial class ActiveScriptJsEngineBase : InnerJsEngineBase
 	{
+		/// <summary>
+		/// Name of resource, which contains a ECMAScript 5 Polyfill
+		/// </summary>
+		private const string ES5_POLYFILL_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.ES5.min.js";
+
+		/// <summary>
+		/// Name of resource, which contains a JSON2 library
+		/// </summary>
+		private const string JSON2_LIBRARY_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.json2.min.js";
+
 		/// <summary>
 		/// Instance of Active Script wrapper
 		/// </summary>
@@ -126,6 +136,7 @@ protected ActiveScriptJsEngineBase(JsEngineSettings settings, string clsid,
 					_activeScriptWrapper.SetScriptSite(CreateScriptSite());
 					_activeScriptWrapper.InitNew();
 					_activeScriptWrapper.SetScriptState(ScriptState.Started);
+					LoadPolyfills();
 
 					_dispatch = WrapScriptDispatch(_activeScriptWrapper.GetScriptDispatch());
 				});
@@ -310,6 +321,29 @@ private void ThrowError()
 		/// <returns>Error type</returns>
 		protected abstract string GetErrorTypeByNumber(int errorNumber);
 
+		/// <summary>
+		/// Loads a JS polyfills
+		/// </summary>
+		private void LoadPolyfills()
+		{
+			Assembly assembly = GetType()
+#if !NET40
+				.GetTypeInfo()
+#endif
+				.Assembly
+				;
+
+			if (_settings.UseEcmaScript5Polyfill)
+			{
+				InnerExecuteResource(ES5_POLYFILL_RESOURCE_NAME, assembly);
+			}
+
+			if (_settings.UseJson2Library)
+			{
+				InnerExecuteResource(JSON2_LIBRARY_RESOURCE_NAME, assembly);
+			}
+		}
+
 		/// <summary>
 		/// Executes a script text
 		/// </summary>
@@ -345,6 +379,17 @@ private object InnerExecute(string code, string documentName, bool isExpression)
 			return result;
 		}
 
+		/// <summary>
+		/// Executes a code from embedded JS resource
+		/// </summary>
+		/// <param name="resourceName">The case-sensitive resource name</param>
+		/// <param name="assembly">The assembly, which contains the embedded resource</param>
+		private void InnerExecuteResource(string resourceName, Assembly assembly)
+		{
+			string code = Utils.GetResourceAsString(resourceName, assembly);
+			InnerExecute(code, resourceName, false);
+		}
+
 		/// <summary>
 		/// Try create a debug document
 		/// </summary>

src/MsieJavaScriptEngine/ActiveScript/ClassicActiveScriptJsEngine.cs

@@ -1,14 +1,7 @@
 #if !NETSTANDARD
-using System;
 using System.Collections.Generic;
-using System.Reflection;
 
 using MsieJavaScriptEngine.Constants;
-#if NET40
-using MsieJavaScriptEngine.Polyfills.System;
-#endif
-using MsieJavaScriptEngine.Resources;
-using MsieJavaScriptEngine.Utilities;
 
 using EXCEPINFO = System.Runtime.InteropServices.ComTypes.EXCEPINFO;
 
@@ -19,16 +12,6 @@ namespace MsieJavaScriptEngine.ActiveScript
 	/// </summary>
 	internal sealed partial class ClassicActiveScriptJsEngine : ActiveScriptJsEngineBase
 	{
-		/// <summary>
-		/// Name of resource, which contains a ECMAScript 5 Polyfill
-		/// </summary>
-		private const string ES5_POLYFILL_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.ES5.min.js";
-
-		/// <summary>
-		/// Name of resource, which contains a JSON2 library
-		/// </summary>
-		private const string JSON2_LIBRARY_RESOURCE_NAME = "MsieJavaScriptEngine.Resources.json2.min.js";
-
 		/// <summary>
 		/// Flag indicating whether this JS engine is supported
 		/// </summary>
@@ -85,9 +68,7 @@ internal sealed partial class ClassicActiveScriptJsEngine : ActiveScriptJsEngine
 		/// <param name="settings">JS engine settings</param>
 		public ClassicActiveScriptJsEngine(JsEngineSettings settings)
 			: base(settings, ClassId.Classic, ScriptLanguageVersion.None, "6", "Microsoft JScript ")
-		{
-			LoadResources(_settings.UseEcmaScript5Polyfill, _settings.UseJson2Library);
-		}
+		{ }
 
 
 		/// <summary>
@@ -111,61 +92,6 @@ protected override string GetErrorTypeByNumber(int errorNumber)
 			return ActiveScriptJsErrorHelpers.GetErrorTypeByNumber(errorNumber, _runtimeErrorTypeMap);
 		}
 
-		/// <summary>
-		/// Loads a resources
-		/// </summary>
-		/// <param name="useEcmaScript5Polyfill">Flag for whether to use the ECMAScript 5 Polyfill</param>
-		/// <param name="useJson2Library">Flag for whether to use the JSON2 library</param>
-		private void LoadResources(bool useEcmaScript5Polyfill, bool useJson2Library)
-		{
-			Assembly assembly = GetType().GetTypeInfo().Assembly;
-
-			if (useEcmaScript5Polyfill)
-			{
-				ExecuteResource(ES5_POLYFILL_RESOURCE_NAME, assembly);
-			}
-
-			if (useJson2Library)
-			{
-				ExecuteResource(JSON2_LIBRARY_RESOURCE_NAME, assembly);
-			}
-		}
-
-		/// <summary>
-		/// Executes a code from embedded JS-resource
-		/// </summary>
-		/// <param name="resourceName">The case-sensitive resource name</param>
-		/// <param name="assembly">The assembly, which contains the embedded resource</param>
-		private void ExecuteResource(string resourceName, Assembly assembly)
-		{
-			if (resourceName == null)
-			{
-				throw new ArgumentNullException(
-					nameof(resourceName),
-					string.Format(CommonStrings.Common_ArgumentIsNull, nameof(resourceName))
-				);
-			}
-
-			if (assembly == null)
-			{
-				throw new ArgumentNullException(
-					nameof(assembly),
-					string.Format(CommonStrings.Common_ArgumentIsNull, nameof(assembly))
-				);
-			}
-
-			if (string.IsNullOrWhiteSpace(resourceName))
-			{
-				throw new ArgumentException(
-					string.Format(CommonStrings.Common_ArgumentIsEmpty, nameof(resourceName)),
-					nameof(resourceName)
-				);
-			}
-
-			string code = Utils.GetResourceAsString(resourceName, assembly);
-			Execute(code, resourceName);
-		}
-
 		#region ActiveScriptJsEngineBase overrides
 
 		/// <summary>