Skip to content

Commit 369654b

Browse files
committed
Editorial: initialize clearTargets in event dispatch correctly
Also clean up "for each" wording while here. Fixes #1344.
1 parent 7cd51e7 commit 369654b

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

dom.bs

+17-15
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ first <a>following</a> <a for=tree>sibling</a> or null if it has no <a for=tree>
146146

147147
<li><p>Let <var>tokens</var> be a new <a>ordered set</a>.
148148

149-
<li><p><a for=list>For each</a> <var>token</var> in <var>inputTokens</var>, <a for=set>append</a>
149+
<li><p><a for=list>For each</a> <var>token</var> of <var>inputTokens</var>, <a for=set>append</a>
150150
<var>token</var> to <var>tokens</var>.
151151

152152
<li>Return <var>tokens</var>.
@@ -894,7 +894,7 @@ correct defaults.</p>
894894
<a>relative high resolution coarse time</a> given <var>time</var> and <var>event</var>'s
895895
<a>relevant global object</a>.
896896

897-
<li><p><a for=map>For each</a> <var>member</var><var>value</var> in <var>dictionary</var>, if
897+
<li><p><a for=map>For each</a> <var>member</var><var>value</var> of <var>dictionary</var>, if
898898
<var>event</var> has an attribute whose <a spec=webidl>identifier</a> is <var>member</var>, then
899899
initialize that attribute to <var>value</var>.
900900

@@ -1305,6 +1305,8 @@ property of the event being dispatched.
13051305
<li><p>Let <var>relatedTarget</var> be the result of <a>retargeting</a> <var>event</var>'s
13061306
<a for=Event>relatedTarget</a> against <var>target</var>.
13071307

1308+
<li><p>Let <var>clearTargets</var> be false.
1309+
13081310
<li>
13091311
<p>If <var>target</var> is not <var>relatedTarget</var> or <var>target</var> is <var>event</var>'s
13101312
<a for=Event>relatedTarget</a>:
@@ -1405,18 +1407,17 @@ property of the event being dispatched.
14051407
<li><p>Let <var>clearTargetsStruct</var> be the last struct in <var>event</var>'s
14061408
<a for=Event>path</a> whose <a for=Event/path>shadow-adjusted target</a> is non-null.
14071409

1408-
<li><p>Let <var>clearTargets</var> be true if <var>clearTargetsStruct</var>'s
1409-
<a for=Event/path>shadow-adjusted target</a>, <var>clearTargetsStruct</var>'s
1410-
<a for=Event/path>relatedTarget</a>, or an {{EventTarget}} object in
1411-
<var>clearTargetsStruct</var>'s <a for=Event/path>touch target list</a> is a <a for=/>node</a>
1412-
and its <a for=tree>root</a> is a <a for=/>shadow root</a>; otherwise false.
1410+
<li><p>If <var>clearTargetsStruct</var>'s <a for=Event/path>shadow-adjusted target</a>,
1411+
<var>clearTargetsStruct</var>'s <a for=Event/path>relatedTarget</a>, or an {{EventTarget}} object
1412+
in <var>clearTargetsStruct</var>'s <a for=Event/path>touch target list</a> is a <a for=/>node</a>
1413+
whose <a for=tree>root</a> is a <a for=/>shadow root</a>: set <var>clearTargets</var> to true.
14131414

14141415
<li><p>If <var>activationTarget</var> is non-null and <var>activationTarget</var> has
14151416
<a for=EventTarget>legacy-pre-activation behavior</a>, then run <var>activationTarget</var>'s
14161417
<a for=EventTarget>legacy-pre-activation behavior</a>.
14171418

14181419
<li>
1419-
<p><a for=list>For each</a> <var>struct</var> in <var>event</var>'s <a for=Event>path</a>, in
1420+
<p><a for=list>For each</a> <var>struct</var> of <var>event</var>'s <a for=Event>path</a>, in
14201421
reverse order:
14211422

14221423
<ol>
@@ -1431,7 +1432,7 @@ property of the event being dispatched.
14311432
</ol>
14321433

14331434
<li>
1434-
<p><a for=list>For each</a> <var>struct</var> in <var>event</var>'s <a for=Event>path</a>:
1435+
<p><a for=list>For each</a> <var>struct</var> of <var>event</var>'s <a for=Event>path</a>:
14351436

14361437
<ol>
14371438
<li><p>If <var>struct</var>'s <a for=Event/path>shadow-adjusted target</a> is non-null, then
@@ -1591,7 +1592,7 @@ and an optional <var>legacyOutputDidListenersThrowFlag</var>, run these steps:
15911592
<li><p>Let <var>found</var> be false.
15921593

15931594
<li>
1594-
<p><a for=list>For each</a> <var>listener</var> in <var>listeners</var>, whose
1595+
<p><a for=list>For each</a> <var>listener</var> of <var>listeners</var>, whose
15951596
<a for="event listener">removed</a> is false:
15961597

15971598
<ol>
@@ -4802,7 +4803,7 @@ steps are:
48024803

48034804
<ol>
48044805
<li>
4805-
<p><a for=list>For each</a> <var>attr</var> in <var>node2</var>'s
4806+
<p><a for=list>For each</a> <var>attr</var> of <var>node2</var>'s
48064807
<a for=Element>attribute list</a>:
48074808

48084809
<ol>
@@ -7370,7 +7371,7 @@ steps:
73707371
<li>
73717372
<p>If this {{NamedNodeMap}} object's <a for=NamedNodeMap>element</a> is in the
73727373
<a>HTML namespace</a> and its <a for=Node>node document</a> is an <a>HTML document</a>, then
7373-
<a for=list>for each</a> <var>name</var> in <var>names</var>:
7374+
<a for=list>for each</a> <var>name</var> of <var>names</var>:
73747375

73757376
<ol>
73767377
<li><p>Let <var>lowercaseName</var> be <var>name</var>, in <a>ASCII lowercase</a>.
@@ -10050,7 +10051,7 @@ method steps are:
1005010051

1005110052
<ol>
1005210053
<li>
10053-
<p><a for=list>For each</a> <var>token</var> in <var>tokens</var>:
10054+
<p><a for=list>For each</a> <var>token</var> of <var>tokens</var>:
1005410055

1005510056
<ol>
1005610057
<li><p>If <var>token</var> is the empty string, then <a>throw</a> a "{{SyntaxError!!exception}}"
@@ -10060,7 +10061,7 @@ method steps are:
1006010061
"{{InvalidCharacterError!!exception}}" {{DOMException}}.
1006110062
</ol>
1006210063

10063-
<li><p><a for=list>For each</a> <var>token</var> in <var>tokens</var>, <a for=set>append</a>
10064+
<li><p><a for=list>For each</a> <var>token</var> of <var>tokens</var>, <a for=set>append</a>
1006410065
<var>token</var> to <a>this</a>'s <a>token set</a>.
1006510066

1006610067
<li><p>Run the <a>update steps</a>.
@@ -10072,7 +10073,7 @@ method steps are:
1007210073

1007310074
<ol>
1007410075
<li>
10075-
<p><a for=list>For each</a> <var>token</var> in <var>tokens</var>:
10076+
<p><a for=list>For each</a> <var>token</var> of <var>tokens</var>:
1007610077

1007710078
<ol>
1007810079
<li><p>If <var>token</var> is the empty string, then <a>throw</a> a "{{SyntaxError!!exception}}"
@@ -10549,6 +10550,7 @@ Sergey G. Grekhov,
1054910550
Shiki Okasaka,
1055010551
Shinya Kawanaka,
1055110552
Simon Pieters,
10553+
Simon Wülker,
1055210554
Stef Busking,
1055310555
Steve Byrne,
1055410556
Stig Halvorsen,

0 commit comments

Comments
 (0)