Merge pull request Taritsyn#60 from Gekctek/3.X

Taritsyn · web-flow · commit 4b79653fc5cd · 2018-09-08T11:07:03.000+03:00
Adding timezone settings for JintEngine
diff --git a/src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs b/src/JavaScriptEngineSwitcher.Jint/JintJsEngine.cs
@@ -84,6 +84,7 @@ public JintJsEngine(JintSettings settings)
 					.MaxStatements(jintSettings.MaxStatements)
 					.Strict(jintSettings.StrictMode)
 					.TimeoutInterval(jintSettings.TimeoutInterval)
+					.LocalTimeZone(jintSettings.LocalTimeZone ?? TimeZoneInfo.Local)
 				);
 			}
 			catch (Exception e)
diff --git a/src/JavaScriptEngineSwitcher.Jint/JintSettings.cs b/src/JavaScriptEngineSwitcher.Jint/JintSettings.cs
@@ -74,6 +74,15 @@ public TimeSpan TimeoutInterval
 			set;
 		}
 
+		/// <summary>
+		/// Gets or sets the local timezone for the dates in the script
+		/// </summary>
+		public TimeZoneInfo LocalTimeZone
+		{
+			get;
+			set;
+		}
+
 
 		/// <summary>
 		/// Constructs an instance of the Jint settings
@@ -86,6 +95,7 @@ public JintSettings()
 			MaxStatements = 0;
 			StrictMode = false;
 			TimeoutInterval = TimeSpan.Zero;
+			LocalTimeZone = TimeZoneInfo.Local;
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ public JintJsEngine(JintSettings settings)`
`84`	`84`	`.MaxStatements(jintSettings.MaxStatements)`
`85`	`85`	`.Strict(jintSettings.StrictMode)`
`86`	`86`	`.TimeoutInterval(jintSettings.TimeoutInterval)`
	`87`	`+ .LocalTimeZone(jintSettings.LocalTimeZone ?? TimeZoneInfo.Local)`
`87`	`88`	`);`
`88`	`89`	`}`
`89`	`90`	`catch (Exception e)`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,15 @@ public TimeSpan TimeoutInterval`
`74`	`74`	`set;`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ /// <summary>`
	`78`	`+ /// Gets or sets the local timezone for the dates in the script`
	`79`	`+ /// </summary>`
	`80`	`+ public TimeZoneInfo LocalTimeZone`
	`81`	`+ {`
	`82`	`+ get;`
	`83`	`+ set;`
	`84`	`+ }`
	`85`	`+`
`77`	`86`
`78`	`87`	`/// <summary>`
`79`	`88`	`/// Constructs an instance of the Jint settings`
`@@ -86,6 +95,7 @@ public JintSettings()`
`86`	`95`	`MaxStatements = 0;`
`87`	`96`	`StrictMode = false;`
`88`	`97`	`TimeoutInterval = TimeSpan.Zero;`
	`98`	`+ LocalTimeZone = TimeZoneInfo.Local;`
`89`	`99`	`}`
`90`	`100`	`}`
`91`	`101`	`}`