Skip to content

Commit 12b0d58

Browse files
authored
Fix and clarify firing traverse navigate events
Some call sites were not correct in how they specified the target Navigation object. Also, add an assert about userInvolvementForNavigateEvents, and make a very long condition clause into a bulleted list.
1 parent 5b5c167 commit 12b0d58

File tree

1 file changed

+33
-11
lines changed

1 file changed

+33
-11
lines changed

source

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99033,8 +99033,8 @@ location.href = '#foo';</code></pre>
9903399033

9903499034
<li><p>Let <var>navigateEventResult</var> be the result of <span data-x="fire a traverse
9903599035
navigate event">firing a traverse <code data-x="event-navigate">navigate</code>
99036-
event</span> at a <code>Navigation</code> <var>navigation</var> given
99037-
<var>targetEntry</var> and <var>userInvolvementForNavigateEvent</var>.</p></li>
99036+
event</span> at <var>navigation</var> given <var>targetEntry</var> and
99037+
<var>userInvolvementForNavigateEvent</var>.</p></li>
9903899038

9903999039
<li><p>If <var>navigateEventResult</var> is false, then set <var>finalStatus</var> to
9904099040
"<code data-x="">canceled-by-navigate</code>".</p></li>
@@ -100883,15 +100883,37 @@ location.href = '#foo';</code></pre>
100883100883
data-x="she-document-state">document state</span>'s <span
100884100884
data-x="document-state-origin">origin</span>.</p></li>
100885100885

100886-
<li id="descendant-navigable-traversal-navigate-events"><p>If <var>navigable</var> is not
100887-
<var>traversable</var>, and <var>targetEntry</var> is not <var>navigable</var>'s <span
100888-
data-x="nav-current-history-entry">current session history entry</span>, and
100889-
<var>oldOrigin</var> is the <span data-x="same origin">same</span> as <var>navigable</var>'s
100890-
<span data-x="nav-current-history-entry">current session history entry</span>'s <span
100891-
data-x="she-document-state">document state</span>'s <span
100892-
data-x="document-state-origin">origin</span>, then <span>fire a traverse <code
100893-
data-x="event-navigate">navigate</code> event</span> given <var>targetEntry</var> and
100894-
<var>userInvolvementForNavigateEvents</var>.</p></li>
100886+
<li id="descendant-navigable-traversal-navigate-events">
100887+
<p>If all of the following are true:</p>
100888+
100889+
<ul>
100890+
<li><p><var>navigable</var> is not <var>traversable;</var></p></li>
100891+
100892+
<li><p><var>targetEntry</var> is not <var>navigable</var>'s <span
100893+
data-x="nav-current-history-entry">current session history entry</span>; and</p></li>
100894+
100895+
<li><p><var>oldOrigin</var> is the <span data-x="same origin">same</span> as
100896+
<var>navigable</var>'s <span
100897+
data-x="nav-current-history-entry">current session history entry</span>'s <span
100898+
data-x="she-document-state">document state</span>'s <span
100899+
data-x="document-state-origin">origin</span>,</p></li>
100900+
</ul>
100901+
100902+
<p>then:</p>
100903+
100904+
<ol>
100905+
<li><p><span>Assert</span>: <var>userInvolvementForNavigateEvents</var> is not
100906+
null.</p></li>
100907+
100908+
<li><p>Let <var>navigation</var> be <var>navigable</var>'s <span
100909+
data-x="nav-window">active window</span>'s <span
100910+
data-x="window-navigation-api">navigation API.</span></p></li>
100911+
100912+
<li><p><span>Fire a traverse <code data-x="event-navigate">navigate</code> event</span> at
100913+
<var>navigation</var> given <var>targetEntry</var> and
100914+
<var>userInvolvementForNavigateEvents</var>.</p></li>
100915+
</ol>
100916+
</li>
100895100917

100896100918
<li>
100897100919
<p>If <var>targetEntry</var>'s <span data-x="she-document">document</span> is null, or

0 commit comments

Comments
 (0)