Skip to content

Commit d1c04b2

Browse files
FlorianRapplFlorianRappl
committed
Updated to AngleSharp v0.9.7
1 parent 121374c commit d1c04b2

File tree

12 files changed

+32
-55
lines changed

12 files changed

+32
-55
lines changed

‎src/AngleSharp.Scripting.JavaScript.Generator/AngleSharp.Scripting.JavaScript.Generator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
35-
<HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
34+
<Reference Include="AngleSharp, Version=0.9.7.86, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
35+
<HintPath>..\packages\AngleSharp.0.9.7\lib\net45\AngleSharp.dll</HintPath>
3636
<Private>True</Private>
3737
</Reference>
3838
<Reference Include="System" />

‎src/AngleSharp.Scripting.JavaScript.Generator/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.6" targetFramework="net46" />
3+
<package id="AngleSharp" version="0.9.7" targetFramework="net45" />
44
</packages>

‎src/AngleSharp.Scripting.JavaScript.Tests/AngleSharp.Scripting.JavaScript.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
40-
<HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
39+
<Reference Include="AngleSharp, Version=0.9.7.86, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
40+
<HintPath>..\packages\AngleSharp.0.9.7\lib\net45\AngleSharp.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="Jint, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
@@ -54,8 +54,8 @@
5454
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
5555
<Private>False</Private>
5656
</Reference>
57-
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
58-
<HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
57+
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
58+
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
6161
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

‎src/AngleSharp.Scripting.JavaScript.Tests/ComponentTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ComponentTests
1010
{
1111
static async Task<String> RunScriptComponent(String script)
1212
{
13-
var service = new ScriptingService();
13+
var service = new JavaScriptProvider();
1414
var cfg = Configuration.Default.With(service);
1515
var html = String.Concat("<!doctype html><script>", script, "</script>");
1616
var document = await BrowsingContext.New(cfg).OpenAsync(m => m.Content(html));

‎src/AngleSharp.Scripting.JavaScript.Tests/FireEventTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class FireEventTests
1111
[Test]
1212
public async Task InvokeFunctionOnLoadEventShouldFireDelayed()
1313
{
14-
var service = new ScriptingService();
14+
var service = new JavaScriptProvider();
1515
var cfg = Configuration.Default.With(service);
1616
var html = "<!doctype html><div id=result></div><script>document.addEventListener('load', function () { document.querySelector('#result').textContent = 'done'; }, false);</script>";
1717
var document = await BrowsingContext.New(cfg).OpenAsync(m => m.Content(html));
@@ -24,7 +24,7 @@ public async Task InvokeFunctionOnLoadEventShouldFireDelayed()
2424
[Test]
2525
public async Task InvokeFunctionOnCustomEvent()
2626
{
27-
var service = new ScriptingService();
27+
var service = new JavaScriptProvider();
2828
var cfg = Configuration.Default.With(service);
2929
var html = "<!doctype html><div id=result>0</div><script>var i = 0; document.addEventListener('hello', function () { i++; document.querySelector('#result').textContent = i.toString(); }, false);</script>";
3030
var document = await BrowsingContext.New(cfg).OpenAsync(m => m.Content(html));
@@ -38,7 +38,7 @@ public async Task InvokeFunctionOnCustomEvent()
3838
[Test]
3939
public async Task InvokeLoadEventFromJsAndCustomEventFromJsAndCs()
4040
{
41-
var service = new ScriptingService();
41+
var service = new JavaScriptProvider();
4242
var cfg = Configuration.Default.With(service);
4343
var html = @"<!doctype html>
4444
<html>
@@ -72,7 +72,7 @@ public async Task InvokeLoadEventFromJsAndCustomEventFromJsAndCs()
7272
[Test]
7373
public async Task AddClickHandlerClassicallyWillExecute()
7474
{
75-
var service = new ScriptingService();
75+
var service = new JavaScriptProvider();
7676
var cfg = Configuration.Default.With(service);
7777
var html = @"<!doctype html>
7878
<html>
@@ -93,7 +93,7 @@ public async Task AddClickHandlerClassicallyWillExecute()
9393
[Test]
9494
public async Task AddAndRemoveClickHandlerWontExecute()
9595
{
96-
var service = new ScriptingService();
96+
var service = new JavaScriptProvider();
9797
var cfg = Configuration.Default.With(service);
9898
var html = @"<!doctype html>
9999
<html>
@@ -115,7 +115,7 @@ public async Task AddAndRemoveClickHandlerWontExecute()
115115
[Test]
116116
public async Task AddAndInvokeClickHandlerWillChangeCapturedValue()
117117
{
118-
var service = new ScriptingService();
118+
var service = new JavaScriptProvider();
119119
var cfg = Configuration.Default.With(service);
120120
var html = @"<!doctype html>
121121
<html>

‎src/AngleSharp.Scripting.JavaScript.Tests/InteractionTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class InteractionTests
1212
[Test]
1313
public async Task ReadStoredJavaScriptValueFromCSharp()
1414
{
15-
var service = new ScriptingService();
15+
var service = new JavaScriptProvider();
1616
var cfg = Configuration.Default.With(service);
1717
var html = "<!doctype html><script>var foo = 'test';</script>";
1818
var document = await BrowsingContext.New(cfg).OpenAsync(m => m.Content(html));
@@ -24,7 +24,7 @@ public async Task ReadStoredJavaScriptValueFromCSharp()
2424
[Test]
2525
public async Task RunJavaScriptFunctionFromCSharp()
2626
{
27-
var service = new ScriptingService();
27+
var service = new JavaScriptProvider();
2828
var cfg = Configuration.Default.With(service);
2929
var html = "<!doctype html><script>function square(x) { return x * x; }</script>";
3030
var document = await BrowsingContext.New(cfg).OpenAsync(m => m.Content(html));
@@ -37,7 +37,7 @@ public async Task RunJavaScriptFunctionFromCSharp()
3737
[Test]
3838
public async Task RunCSharpFunctionFromJavaScript()
3939
{
40-
var service = new ScriptingService();
40+
var service = new JavaScriptProvider();
4141
var cfg = Configuration.Default.With(service);
4242
var storedValue = 0.0;
4343
service.Engine.External["square"] = new Action<Double>(x => storedValue = x);
@@ -49,7 +49,7 @@ public async Task RunCSharpFunctionFromJavaScript()
4949
[Test]
5050
public async Task AccessCSharpInstanceMembersFromJavaScript()
5151
{
52-
var service = new ScriptingService();
52+
var service = new JavaScriptProvider();
5353
var cfg = Configuration.Default.With(service);
5454
service.Engine.External["person"] = new Person { Age = 20, Name = "Foobar" };
5555
var html = "<!doctype html><script>var str = person.Name + ' is ' + person.Age + ' years old';</script>";

‎src/AngleSharp.Scripting.JavaScript.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AngleSharp" version="0.9.6" targetFramework="net46" />
3+
<package id="AngleSharp" version="0.9.7" targetFramework="net45" />
44
<package id="Jint" version="2.8" targetFramework="net46" />
55
<package id="NUnit" version="3.4.1" targetFramework="net45" />
66
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net46" />

‎src/AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<DocumentationFile>bin\Release\AngleSharp.Scripting.JavaScript.xml</DocumentationFile>
3333
</PropertyGroup>
3434
<ItemGroup>
35-
<Reference Include="AngleSharp, Version=0.9.6.41832, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
36-
<HintPath>..\packages\AngleSharp.0.9.6\lib\net45\AngleSharp.dll</HintPath>
35+
<Reference Include="AngleSharp, Version=0.9.7.86, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
36+
<HintPath>..\packages\AngleSharp.0.9.7\lib\net45\AngleSharp.dll</HintPath>
3737
<Private>True</Private>
3838
</Reference>
3939
<Reference Include="Jint, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
@@ -73,8 +73,7 @@
7373
<Compile Include="Extensions.cs" />
7474
<Compile Include="JavaScriptEngine.cs" />
7575
<Compile Include="Properties\AssemblyInfo.cs" />
76-
<Compile Include="Services\ScriptingService.cs" />
77-
<Compile Include="Services\NavigatorService.cs" />
76+
<Compile Include="Services\JavaScriptProvider.cs" />
7877
<Compile Include="SystemTypeConverter.cs" />
7978
<Compile Include="UnresolvedConverter.cs" />
8079
</ItemGroup>

‎src/AngleSharp.Scripting.JavaScript/ConfigurationExtensions.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
namespace AngleSharp
22
{
3+
using AngleSharp.Dom.Navigator;
4+
using AngleSharp.Scripting.JavaScript.Dom;
35
using AngleSharp.Scripting.JavaScript.Services;
4-
using AngleSharp.Services;
6+
using System;
57
using System.Linq;
68

79
/// <summary>
@@ -18,14 +20,13 @@ public static class ConfigurationExtensions
1820
/// <returns>The new configuration.</returns>
1921
public static IConfiguration WithJavaScript(this IConfiguration configuration)
2022
{
21-
if (!configuration.Services.OfType<ScriptingService>().Any())
23+
if (!configuration.Services.OfType<JavaScriptProvider>().Any())
2224
{
23-
var service = new ScriptingService();
25+
var service = new JavaScriptProvider();
2426

25-
if (!configuration.Services.OfType<INavigatorService>().Any())
27+
if (!configuration.Services.OfType<Func<IBrowsingContext, INavigator>>().Any())
2628
{
27-
var navigator = new NavigatorService();
28-
configuration = configuration.With(navigator);
29+
configuration = configuration.With<INavigator>(context => new Navigator());
2930
}
3031

3132
return configuration.With(service);

‎src/AngleSharp.Scripting.JavaScript/Services/ScriptingService.cs renamed to ‎src/AngleSharp.Scripting.JavaScript/Services/JavaScriptProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/// <summary>
99
/// Represents the service for the JavaScript engine.
1010
/// </summary>
11-
public class ScriptingService : IScriptingService
11+
public class JavaScriptProvider : IScriptingProvider
1212
{
1313
readonly JavaScriptEngine _engine;
1414

1515
/// <summary>
1616
/// Creates a new scripting service.
1717
/// </summary>
18-
public ScriptingService()
18+
public JavaScriptProvider()
1919
{
2020
_engine = new JavaScriptEngine();
2121
}

0 commit comments

Comments
 (0)