[] (0) Make hashchange and popstate fire after scrolling and UA updates.

git-svn-id: http://svn.whatwg.org/webapps@3850 340c8d12-0b0e-0410-8428-c7bf67bfef74

index

@@ -54631,12 +54631,17 @@ style/default.css</pre>
    created. (This can never happen with <a href=#replacement-enabled>replacement
    enabled</a>.)</li>
 
-   <li><p>If appropriate, update the <a href=#current-entry>current entry</a> in the
-   <a href=#browsing-context>browsing context</a>'s <code>Document</code> object's
-   <code><a href=#history-0>History</a></code> object to reflect any state that the user
-   agent wishes to persist.</p>
-   <p class=example>For example, some user agents might want to
-   persist the scroll position, or the values of form controls.</p>
+   <li>
+
+    <p>If appropriate, update the <a href=#current-entry>current entry</a> in the
+    <a href=#browsing-context>browsing context</a>'s <code>Document</code> object's
+    <code><a href=#history-0>History</a></code> object to reflect any state that the user
+    agent wishes to persist. The entry is then said to be <dfn id=an-entry-with-persisted-user-state>an
+    entry with persisted user state</dfn>.</p>
+
+    <p class=example>For example, some user agents might want to
+    persist the scroll position, or the values of form controls.</p>
+
    </li>
 
    <li><p>If the <i>specified entry</i> has a different
@@ -54699,21 +54704,24 @@ style/default.css</pre>
 
    <li><p>If the traversal was initiated with <dfn id=replacement-enabled>replacement
    enabled</dfn>, remove the entry immediately before the
-   <span>specified entry</span> in the session history.</p>
+   <var title="">specified entry</var> in the session history.</p>
+
+   <li><p>If <var title="">hash changed</var> is true, then, if the
+   new URL has a fragment identifier, <a href=#scroll-to-the-fragment-identifier>scroll to the fragment
+   identifier</a>.</li>
+
+   <li><p>If the entry is <a href=#an-entry-with-persisted-user-state>an entry with persisted user
+   state</a>, the user agent may update aspects of the document
+   view, for instance the scroll position or values of form fields,
+   that it had previously recorded.</li>
 
    <li><p>If the <i>specified entry</i> is a state object or the
    first entry for a <code>Document</code>, the user agent must <a href=#activating-state-object-entries title="activate the state object">activate that
    entry</a>.</li>
 
-   <li><p>If <var title="">hash changed</var> is true, then first,
+   <li><p>If <var title="">hash changed</var> is true, then
    synchronously <a href=#fire-a-simple-event>fire a simple event</a> with the name <code title=event-hashchange>hashchange</code> at the <a href=#browsing-context>browsing
-   context</a>'s <code><a href=#window>Window</a></code> object; and second, if the new
-   URL has a fragment identifier, <a href=#scroll-to-the-fragment-identifier>scroll to the fragment
-   identifier</a>.</li>
-
-   <li><p>User agents may also update other aspects of the document
-   view when the location changes in this way, for instance the scroll
-   position, values of form fields, etc.</li>
+   context</a>'s <code><a href=#window>Window</a></code> object.</li>
 
    <li><p>The <a href=#current-entry>current entry</a> is now the <i>specified
    entry</i>.</li>

source

@@ -61827,12 +61827,17 @@ style/default.css</pre>
    created. (This can never happen with <span>replacement
    enabled</span>.)</p></li>
 
-   <li><p>If appropriate, update the <span>current entry</span> in the
-   <span>browsing context</span>'s <code>Document</code> object's
-   <code>History</code> object to reflect any state that the user
-   agent wishes to persist.</p>
-   <p class="example">For example, some user agents might want to
-   persist the scroll position, or the values of form controls.</p>
+   <li>
+
+    <p>If appropriate, update the <span>current entry</span> in the
+    <span>browsing context</span>'s <code>Document</code> object's
+    <code>History</code> object to reflect any state that the user
+    agent wishes to persist. The entry is then said to be <dfn>an
+    entry with persisted user state</dfn>.</p>
+
+    <p class="example">For example, some user agents might want to
+    persist the scroll position, or the values of form controls.</p>
+
    </li>
 
    <li><p>If the <i>specified entry</i> has a different
@@ -61910,23 +61915,26 @@ style/default.css</pre>
 
    <li><p>If the traversal was initiated with <dfn>replacement
    enabled</dfn>, remove the entry immediately before the
-   <span>specified entry</span> in the session history.</p>
+   <var title="">specified entry</var> in the session history.</p>
+
+   <li><p>If <var title="">hash changed</var> is true, then, if the
+   new URL has a fragment identifier, <span>scroll to the fragment
+   identifier</span>.</p></li>
+
+   <li><p>If the entry is <span>an entry with persisted user
+   state</span>, the user agent may update aspects of the document
+   view, for instance the scroll position or values of form fields,
+   that it had previously recorded.</p></li>
 
    <li><p>If the <i>specified entry</i> is a state object or the
    first entry for a <code>Document</code>, the user agent must <span
    title="activate the state object">activate that
    entry</span>.</p></li>
 
-   <li><p>If <var title="">hash changed</var> is true, then first,
+   <li><p>If <var title="">hash changed</var> is true, then
    synchronously <span>fire a simple event</span> with the name <code
    title="event-hashchange">hashchange</code> at the <span>browsing
-   context</span>'s <code>Window</code> object; and second, if the new
-   URL has a fragment identifier, <span>scroll to the fragment
-   identifier</span>.</p></li>
-
-   <li><p>User agents may also update other aspects of the document
-   view when the location changes in this way, for instance the scroll
-   position, values of form fields, etc.</p></li>
+   context</span>'s <code>Window</code> object.</p></li>
 
    <li><p>The <span>current entry</span> is now the <i>specified
    entry</i>.</p></li>