[html5] r4591 - [giow] (1) Be clear that pushState() and replaceState() override the normal titl [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2010-01-14 22:10:58 -0800 (Thu, 14 Jan 2010)
New Revision: 4591

Modified:
   complete.html
   index
   source
Log:
[giow] (1) Be clear that pushState() and replaceState() override the normal title-setting for an entry, but that normal navigation (e.g. by fragment identifier) gets its title from document.title.

Modified: complete.html
===================================================================
--- complete.html	2010-01-15 00:21:06 UTC (rev 4590)
+++ complete.html	2010-01-15 06:10:58 UTC (rev 4591)
@@ -56844,14 +56844,13 @@
 
    <li><p>Append a new entry at the end of the <code><a href=#history-0>History</a></code>
    object representing the new resource and its <code>Document</code>
-   object and related state, and set its URL to the address to which
-   the user agent was <a href=#navigate title=navigate>navigating</a>. (This
-   will be the same as <a href="#the-document's-address">the document's address</a>, but with a
-   new fragment identifier.)</li>
+   object and related state. Its <a href=#url>URL</a> must be set to the
+   address to which the user agent was <a href=#navigate title=navigate>navigating</a>. The title must be left
+   unset.</li>
 
    <li><p><a href=#traverse-the-history>Traverse the history</a> to the new entry. This
-   will <a href=#scroll-to-the-fragment-identifier>scroll to the fragment identifier</a> given in
-   <a href="#the-document's-current-address">the document's current address</a>.</li>
+   will <a href=#scroll-to-the-fragment-identifier>scroll to the fragment identifier</a> given in what
+   is now <a href="#the-document's-current-address">the document's current address</a>.</li>
 
   </ol><p class=note>If the scrolling fails because the relevant ID has
   not yet been parsed, then the original <a href=#navigate title=navigate>navigation</a> algorithm will take care of the
@@ -56933,6 +56932,11 @@
 
    <li><p>Release the <a href=#storage-mutex>storage mutex</a>.</li>
 
+   <li><p>If the <a href=#current-entry>current entry</a>'s title was not set by the
+   <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> or <code title=dom-history-replaceState><a href=#dom-history-replacestate>replaceState()</a></code> methods,
+   then set its title to the value returned by the <code title=dom-document-title><a href=#document.title>document.title</a></code> IDL
+   attribute.</li>
+
    <li>
 
     <p>If appropriate, update the <a href=#current-entry>current entry</a> in the

Modified: index
===================================================================
--- index	2010-01-15 00:21:06 UTC (rev 4590)
+++ index	2010-01-15 06:10:58 UTC (rev 4591)
@@ -56758,14 +56758,13 @@
 
    <li><p>Append a new entry at the end of the <code><a href=#history-0>History</a></code>
    object representing the new resource and its <code>Document</code>
-   object and related state, and set its URL to the address to which
-   the user agent was <a href=#navigate title=navigate>navigating</a>. (This
-   will be the same as <a href="#the-document's-address">the document's address</a>, but with a
-   new fragment identifier.)</li>
+   object and related state. Its <a href=#url>URL</a> must be set to the
+   address to which the user agent was <a href=#navigate title=navigate>navigating</a>. The title must be left
+   unset.</li>
 
    <li><p><a href=#traverse-the-history>Traverse the history</a> to the new entry. This
-   will <a href=#scroll-to-the-fragment-identifier>scroll to the fragment identifier</a> given in
-   <a href="#the-document's-current-address">the document's current address</a>.</li>
+   will <a href=#scroll-to-the-fragment-identifier>scroll to the fragment identifier</a> given in what
+   is now <a href="#the-document's-current-address">the document's current address</a>.</li>
 
   </ol><p class=note>If the scrolling fails because the relevant ID has
   not yet been parsed, then the original <a href=#navigate title=navigate>navigation</a> algorithm will take care of the
@@ -56847,6 +56846,11 @@
 
    <li><p>Release the <a href=#storage-mutex>storage mutex</a>.</li>
 
+   <li><p>If the <a href=#current-entry>current entry</a>'s title was not set by the
+   <code title=dom-history-pushState><a href=#dom-history-pushstate>pushState()</a></code> or <code title=dom-history-replaceState><a href=#dom-history-replacestate>replaceState()</a></code> methods,
+   then set its title to the value returned by the <code title=dom-document-title><a href=#document.title>document.title</a></code> IDL
+   attribute.</li>
+
    <li>
 
     <p>If appropriate, update the <a href=#current-entry>current entry</a> in the

Modified: source
===================================================================
--- source	2010-01-15 00:21:06 UTC (rev 4590)
+++ source	2010-01-15 06:10:58 UTC (rev 4591)
@@ -64272,14 +64272,14 @@
 
    <li><p>Append a new entry at the end of the <code>History</code>
    object representing the new resource and its <code>Document</code>
-   object and related state, and set its URL to the address to which
-   the user agent was <span title="navigate">navigating</span>. (This
-   will be the same as <span>the document's address</span>, but with a
-   new fragment identifier.)</p></li>
+   object and related state. Its <span>URL</span> must be set to the
+   address to which the user agent was <span
+   title="navigate">navigating</span>. The title must be left
+   unset.</p></li>
 
    <li><p><span>Traverse the history</span> to the new entry. This
-   will <span>scroll to the fragment identifier</span> given in
-   <span>the document's current address</span>.</p></li>
+   will <span>scroll to the fragment identifier</span> given in what
+   is now <span>the document's current address</span>.</p></li>
 
   </ol>
 
@@ -64376,6 +64376,13 @@
 
    <li><p>Release the <span>storage mutex</span>.</p></li>
 
+   <li><p>If the <span>current entry</span>'s title was not set by the
+   <code title="dom-history-pushState">pushState()</code> or <code
+   title="dom-history-replaceState">replaceState()</code> methods,
+   then set its title to the value returned by the <code
+   title="dom-document-title">document.title</code> IDL
+   attribute.</p></li>
+
    <li>
 
     <p>If appropriate, update the <span>current entry</span> in the