Placed in AngleSharp.Extensions namespace

FlorianRappl · FlorianRappl · commit 619b9cd8c24c · 2016-10-01T21:38:46.000+02:00
diff --git a/src/AngleSharp.Scripting.JavaScript.Tests/InteractionTests.cs b/src/AngleSharp.Scripting.JavaScript.Tests/InteractionTests.cs
@@ -1,6 +1,7 @@
 ﻿namespace AngleSharp.Scripting.JavaScript.Tests
 {
     using AngleSharp.Scripting.JavaScript.Services;
+    using AngleSharp.Extensions;
     using Jint.Runtime;
     using NUnit.Framework;
     using System;
@@ -79,6 +80,16 @@ public async Task RunScriptSnippetDirectlyGetComplexObjectFromProperty()
             Assert.AreEqual(document.DefaultView, result);
         }
 
+        [Test]
+        public async Task RunScriptSnippetDirectlyGetsWindow()
+        {
+            var html = "<!doctype html><span id=test>Test</span>";
+            var config = Configuration.Default.WithJavaScript();
+            var document = await BrowsingContext.New(config).OpenAsync(m => m.Content(html));
+            var result = document.ExecuteScript("window");
+            Assert.AreEqual(document.DefaultView, result);
+        }
+
         [Test]
         public async Task RunScriptSnippetDirectlyGetComplexObjectFromQuerySelector()
         {
diff --git a/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj b/src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj
@@ -50,7 +50,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ApiExtensions.cs" />
+    <Compile Include="JsApiExtensions.cs" />
     <Compile Include="Attributes\DomInstanceAttribute.cs" />
     <Compile Include="JsConfigurationExtensions.cs" />
     <Compile Include="ConsoleInstance.cs" />
diff --git a/src/AngleSharp.Scripting.JavaScript/EngineInstance.cs b/src/AngleSharp.Scripting.JavaScript/EngineInstance.cs
@@ -101,12 +101,12 @@ public DomNodeInstance GetDomNode(Object obj)
             return domNodeInstance;
         }
 
-        public Object RunScript(String source, JsValue context)
+        public JsValue RunScript(String source, JsValue context)
         {
             _engine.EnterExecutionContext(Lexicals, Variables, context);
             _engine.Execute(source);
             _engine.LeaveExecutionContext();
-            return _engine.GetCompletionValue().FromJsValue();
+            return _engine.GetCompletionValue();
         }
 
         #endregion
diff --git a/src/AngleSharp.Scripting.JavaScript/Extensions.cs b/src/AngleSharp.Scripting.JavaScript/Extensions.cs
@@ -261,12 +261,12 @@ public static void AddInstance(this EngineInstance engine, ObjectInstance obj, T
             }
         }
 
-        public static Object RunScript(this EngineInstance engine, String source)
+        public static JsValue RunScript(this EngineInstance engine, String source)
         {
             return engine.RunScript(source, engine.Window);
         }
 
-        public static Object RunScript(this EngineInstance engine, String source, INode context)
+        public static JsValue RunScript(this EngineInstance engine, String source, INode context)
         {
             return engine.RunScript(source, context.ToJsValue(engine));
         }
diff --git a/src/AngleSharp.Scripting.JavaScript/JavaScriptEngine.cs b/src/AngleSharp.Scripting.JavaScript/JavaScriptEngine.cs
@@ -95,7 +95,7 @@ public Object EvaluateScript(IDocument document, String source)
             if (document == null)
                 throw new ArgumentNullException(nameof(document));
             
-            return GetOrCreateInstance(document).RunScript(source);
+            return GetOrCreateInstance(document).RunScript(source).FromJsValue();
         }
 
         #endregion
diff --git a/src/AngleSharp.Scripting.JavaScript/JsApiExtensions.cs b/src/AngleSharp.Scripting.JavaScript/JsApiExtensions.cs
@@ -1,4 +1,4 @@
-﻿namespace AngleSharp.Scripting.JavaScript
+﻿namespace AngleSharp.Extensions
 {
     using AngleSharp.Dom;
     using AngleSharp.Scripting.JavaScript.Services;
@@ -8,7 +8,7 @@
     /// <summary>
     /// Useful extensions for the DOM.
     /// </summary>
-    public static class ApiExtensions
+    public static class JsApiExtensions
     {
         /// <summary>
         /// Executes the given script code in the context of the document.

Original file line number	Diff line number	Diff line change
`@@ -101,12 +101,12 @@ public DomNodeInstance GetDomNode(Object obj)`
`101`	`101`	`return domNodeInstance;`
`102`	`102`	`}`
`103`	`103`
`104`		`- public Object RunScript(String source, JsValue context)`
	`104`	`+ public JsValue RunScript(String source, JsValue context)`
`105`	`105`	`{`
`106`	`106`	`_engine.EnterExecutionContext(Lexicals, Variables, context);`
`107`	`107`	`_engine.Execute(source);`
`108`	`108`	`_engine.LeaveExecutionContext();`
`109`		`- return _engine.GetCompletionValue().FromJsValue();`
	`109`	`+ return _engine.GetCompletionValue();`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -261,12 +261,12 @@ public static void AddInstance(this EngineInstance engine, ObjectInstance obj, T`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`
`264`		`- public static Object RunScript(this EngineInstance engine, String source)`
	`264`	`+ public static JsValue RunScript(this EngineInstance engine, String source)`
`265`	`265`	`{`
`266`	`266`	`return engine.RunScript(source, engine.Window);`
`267`	`267`	`}`
`268`	`268`
`269`		`- public static Object RunScript(this EngineInstance engine, String source, INode context)`
	`269`	`+ public static JsValue RunScript(this EngineInstance engine, String source, INode context)`
`270`	`270`	`{`
`271`	`271`	`return engine.RunScript(source, context.ToJsValue(engine));`
`272`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public Object EvaluateScript(IDocument document, String source)`
`95`	`95`	`if (document == null)`
`96`	`96`	`throw new ArgumentNullException(nameof(document));`
`97`	`97`
`98`		`- return GetOrCreateInstance(document).RunScript(source);`
	`98`	`+ return GetOrCreateInstance(document).RunScript(source).FromJsValue();`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace AngleSharp.Scripting.JavaScript`
	`1`	`+namespace AngleSharp.Extensions`
`2`	`2`	`{`
`3`	`3`	`using AngleSharp.Dom;`
`4`	`4`	`using AngleSharp.Scripting.JavaScript.Services;`
`@@ -8,7 +8,7 @@`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Useful extensions for the DOM.`
`10`	`10`	`/// </summary>`
`11`		`- public static class ApiExtensions`
	`11`	`+ public static class JsApiExtensions`
`12`	`12`	`{`
`13`	`13`	`/// <summary>`
`14`	`14`	`/// Executes the given script code in the context of the document.`