Skip to content

Commit c25fe98

Browse files
FlorianRapplFlorianRappl
authored
Merge pull request #54 from AngleSharp/devel
Release 0.12.1
2 parents 08afe8c + 99973db commit c25fe98

10 files changed

+35
-94
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# 0.12.1
2+
3+
Released on Wednesday, May 15 2019.
4+
5+
- Binary version fix
6+
17
# 0.12.0
28

39
Released on Tuesday, May 14 2019.

‎src/AngleSharp.Js.Tests/AngleSharp.Js.Tests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="AngleSharp.Css" Version="0.12.0" />
19-
<PackageReference Include="AngleSharp.Xml" Version="0.12.0" />
18+
<PackageReference Include="AngleSharp.Css" Version="0.12.1" />
19+
<PackageReference Include="AngleSharp.Xml" Version="0.12.1" />
2020
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
2121
<PackageReference Include="NUnit" Version="3.11.0" />
2222
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />

‎src/AngleSharp.Js.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<copyright>Copyright 2017-2019, AngleSharp</copyright>
1515
<tags>html html5 css css3 dom javascript scripting library js scripts runtime jint anglesharp angle</tags>
1616
<dependencies>
17-
<dependency id="AngleSharp" version="0.10.0" />
18-
<dependency id="Jint" version="3.0.0-beta-1353" />
17+
<dependency id="AngleSharp" version="0.12.1" />
18+
<dependency id="Jint" version="2.10.4" />
1919
</dependencies>
2020
</metadata>
2121
</package>

‎src/AngleSharp.Js/AngleSharp.Js.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="AngleSharp" Version="0.12.0" />
14+
<PackageReference Include="AngleSharp" Version="0.12.1" />
1515
<PackageReference Include="Jint" Version="2.10.4" />
1616
</ItemGroup>
1717

‎src/AngleSharp.Js/Attributes/DomEventAttribute.cs

-12
This file was deleted.

‎src/AngleSharp.Js/Attributes/DomInstanceAttribute.cs

-29
This file was deleted.

‎src/AngleSharp.Js/EngineInstance.cs

+2-8
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,9 @@ public JsValue RunScript(String source, JsValue context)
8686

8787
#region Helpers
8888

89-
private DomNodeInstance CreateInstance(Object obj)
90-
{
91-
return new DomNodeInstance(this, obj);
92-
}
89+
private DomNodeInstance CreateInstance(Object obj) => new DomNodeInstance(this, obj);
9390

94-
private ObjectInstance CreatePrototype(Type type)
95-
{
96-
return new DomPrototypeInstance(this, type);
97-
}
91+
private ObjectInstance CreatePrototype(Type type) => new DomPrototypeInstance(this, type);
9892

9993
#endregion
10094
}

‎src/AngleSharp.Js/Extensions/ElementPseudoExtensions.cs

+8-16
Original file line numberDiff line numberDiff line change
@@ -98,71 +98,63 @@ public static class ElementPseudoExtensions
9898
/// Adds the focus in event.
9999
/// </summary>
100100
[DomName("focusin")]
101-
[DomEvent]
102-
[DomAccessor(Accessors.Setter)]
101+
[DomAccessor(Accessors.Adder)]
103102
public static void AddFocusIn(this IElement element, DomEventHandler handler) =>
104103
element.AddEventListener("focusin", handler);
105104

106105
/// <summary>
107106
/// Removes the focus in event.
108107
/// </summary>
109108
[DomName("focusin")]
110-
[DomEvent]
111-
[DomAccessor(Accessors.Deleter)]
109+
[DomAccessor(Accessors.Remover)]
112110
public static void RemoveFocusIn(this IElement element, DomEventHandler handler) =>
113111
element.RemoveEventListener("focusin", handler);
114112

115113
/// <summary>
116114
/// Adds the focus out event.
117115
/// </summary>
118116
[DomName("focusout")]
119-
[DomEvent]
120-
[DomAccessor(Accessors.Setter)]
117+
[DomAccessor(Accessors.Adder)]
121118
public static void AddFocusOut(this IElement element, DomEventHandler handler) =>
122119
element.AddEventListener("focusout", handler);
123120

124121
/// <summary>
125122
/// Removes the focus out event.
126123
/// </summary>
127124
[DomName("focusout")]
128-
[DomEvent]
129-
[DomAccessor(Accessors.Deleter)]
125+
[DomAccessor(Accessors.Remover)]
130126
public static void RemoveFocusOut(this IElement element, DomEventHandler handler) =>
131127
element.RemoveEventListener("focusout", handler);
132128

133129
/// <summary>
134130
/// Adds the unload event.
135131
/// </summary>
136132
[DomName("unload")]
137-
[DomEvent]
138-
[DomAccessor(Accessors.Setter)]
133+
[DomAccessor(Accessors.Adder)]
139134
public static void AddUnload(this IElement element, DomEventHandler handler) =>
140135
element.AddEventListener("unload", handler);
141136

142137
/// <summary>
143138
/// Removes the unload event.
144139
/// </summary>
145140
[DomName("unload")]
146-
[DomEvent]
147-
[DomAccessor(Accessors.Deleter)]
141+
[DomAccessor(Accessors.Remover)]
148142
public static void RemoveUnload(this IElement element, DomEventHandler handler) =>
149143
element.RemoveEventListener("unload", handler);
150144

151145
/// <summary>
152146
/// Adds the contextmenu event.
153147
/// </summary>
154148
[DomName("contextmenu")]
155-
[DomEvent]
156-
[DomAccessor(Accessors.Setter)]
149+
[DomAccessor(Accessors.Adder)]
157150
public static void AddContextMenu(this IElement element, DomEventHandler handler) =>
158151
element.AddEventListener("contextmenu", handler);
159152

160153
/// <summary>
161154
/// Removes the contextmenu event.
162155
/// </summary>
163156
[DomName("contextmenu")]
164-
[DomEvent]
165-
[DomAccessor(Accessors.Deleter)]
157+
[DomAccessor(Accessors.Remover)]
166158
public static void RemoveContextMenu(this IElement element, DomEventHandler handler) =>
167159
element.RemoveEventListener("contextmenu", handler);
168160
}

‎src/AngleSharp.Js/Extensions/Extensibility.cs

+13-23
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public static IDictionary<String, ExtensionEntry> GetExtensions(this IEnumerable
1818
.Select(m => m.OfficialName);
1919
var accessors = method.GetCustomAttributes<DomAccessorAttribute>()
2020
.Select(m => m.Type);
21-
var isEvent = method.GetCustomAttribute<DomEventAttribute>() != null;
2221
var forward = method.GetCustomAttribute<DomPutForwardsAttribute>();
2322

2423
foreach (var name in names)
@@ -36,29 +35,20 @@ public static IDictionary<String, ExtensionEntry> GetExtensions(this IEnumerable
3635
{
3736
var accessor = accessors.FirstOrDefault();
3837

39-
if (isEvent)
38+
switch (accessor)
4039
{
41-
switch (accessor)
42-
{
43-
case Accessors.Deleter:
44-
entry.Remover = method;
45-
break;
46-
case Accessors.Setter:
47-
entry.Adder = method;
48-
break;
49-
}
50-
}
51-
else
52-
{
53-
switch (accessor)
54-
{
55-
case Accessors.Setter:
56-
entry.Setter = method;
57-
break;
58-
case Accessors.Getter:
59-
entry.Getter = method;
60-
break;
61-
}
40+
case Accessors.Setter:
41+
entry.Setter = method;
42+
break;
43+
case Accessors.Getter:
44+
entry.Getter = method;
45+
break;
46+
case Accessors.Remover:
47+
entry.Remover = method;
48+
break;
49+
case Accessors.Adder:
50+
entry.Adder = method;
51+
break;
6252
}
6353
}
6454
else

‎src/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<PropertyGroup>
33
<Description>Integrates a JavaScript engine to AngleSharp.</Description>
44
<Product>AngleSharp.Js</Product>
5-
<Version>0.12.0</Version>
5+
<Version>0.12.1</Version>
66
</PropertyGroup>
77
</Project>

0 commit comments

Comments
 (0)