W3C home > Mailing lists > Public > public-html-diffs@w3.org > February 2012

hixie: Clarify that all session history entries have URLs really. (whatwg r6999)

From: poot <cvsmail@w3.org>
Date: Wed, 15 Feb 2012 15:33:04 -0500
To: public-html-diffs@w3.org
Message-Id: <E1RxlXE-0005oF-KI@jay.w3.org>
hixie: Clarify that all session history entries have URLs really.
(whatwg r6999)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.5589&r2=1.5590&f=h
http://html5.org/tools/web-apps-tracker?from=6998&to=6999

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5589
retrieving revision 1.5590
diff -u -d -r1.5589 -r1.5590
--- Overview.html	15 Feb 2012 18:58:50 -0000	1.5589
+++ Overview.html	15 Feb 2012 20:32:52 -0000	1.5590
@@ -47421,10 +47421,11 @@
 
   </div><p><code><a href="#history-0">History</a></code> objects represent their <a href="#browsing-context">browsing
   context</a>'s session history as a flat list of <a href="#session-history-entry" title="session history entry">session history entries</a>. Each
-  <dfn id="session-history-entry">session history entry</dfn> consists of either a
-  <a href="#url">URL</a> or a <a href="#state-object">state object</a>, or both<span class="impl">, and may in addition have a title, a
-  <code><a href="#document">Document</a></code> object, form data, a scroll position, and
-  other information associated with it</span>.<div class="impl">
+  <dfn id="session-history-entry">session history entry</dfn> consists of a <a href="#url">URL</a> and
+  optionally a <a href="#state-object">state object</a><span class="impl">, and may
+  in addition have a title, a <code><a href="#document">Document</a></code> object, form data,
+  a scroll position, and other information associated with
+  it</span>.<div class="impl">
 
   <p class="note">This does not imply that the user interface need be
   linear. See the <a href="#history-notes">notes below</a>.</p>
@@ -47464,8 +47465,9 @@
 
   </div><hr><p>At any point, one of the entries in the session history is the
   <dfn id="current-entry">current entry</dfn>. This is the entry representing the
-  <a href="#active-document">active document</a> of the <a href="#browsing-context">browsing
-  context</a>. The <a href="#current-entry">current entry</a> is usually an entry
+  <a href="#active-document">active document</a> of the <a href="#browsing-context">browsing context</a>.
+  Which entry is the <a href="#current-entry">current entry</a> is changed by the
+  algorithms defined in this specification, e.g. during <a href="#traverse-the-history" title="traverse the history">session history traversal</a>.<p class="note">The <a href="#current-entry">current entry</a> is usually an entry
   for the <a href="#dom-location-href" title="dom-location-href">location</a> of the
   <code><a href="#document">Document</a></code>. However, it can also be one of the entries
   for <a href="#state-object" title="state object">state objects</a> added to the
@@ -47709,6 +47711,9 @@
      these steps. (This prevents sandboxed content from spoofing other
      pages on the same origin.)</li>
 
+     <li><p>Let <var title="">new URL</var> be the resulting
+     <a href="#absolute-url">absolute URL</a>.</li>
+
     </ol><p>For the purposes of the comparisons in the above substeps, the
     <a href="#url-path" title="url-path">&lt;path&gt;</a> and <a href="#url-query" title="url-query">&lt;query&gt;</a> components can only be the
     same if the URLs are both <a href="#hierarchical-url" title="hierarchical
@@ -47718,6 +47723,11 @@
 
    <li>
 
+    <p>If a third argument is <em>not</em> specified, then let <var title="">new URL</var> be the <a href="#url">URL</a> of the
+    <a href="#current-entry">current entry</a>.</p>
+
+   <li>
+
     <p>If the method invoked was the <code title="dom-history-pushState"><a href="#dom-history-pushstate">pushState()</a></code> method:</p>
 
     <ol><li>
@@ -47744,9 +47754,7 @@
 
      <li><p>Add a <a href="#state-object">state object</a> entry to the session
      history, after the <a href="#current-entry">current entry</a>, with <var title="">cloned data</var> as the <a href="#state-object">state object</a>, the
-     given <var title="">title</var> as the title, and, if the third
-     argument is present, the <a href="#absolute-url">absolute URL</a> that was found
-     earlier in this algorithm as the <a href="#url">URL</a> of the
+     given <var title="">title</var> as the title, and <var title="">new URL</var> as the <a href="#url">URL</a> of the
      entry.</li>
 
      <li><p>Update the <a href="#current-entry">current entry</a> to be this newly
@@ -47757,9 +47765,8 @@
     <ol><li><p>Update the <a href="#current-entry">current entry</a> in the session
      history so that <var title="">cloned data</var> is the entry's
      new state object, the given <var title="">title</var> is the new
-     title, and, if the third argument is present, the <a href="#absolute-url">absolute
-     URL</a> that was found earlier in this algorithm is the
-     entry's new <a href="#url">URL</a>.</li>
+     title, and <var title="">new URL</var> is the entry's new
+     <a href="#url">URL</a>.</li>
 
     </ol></li>
 
@@ -47771,9 +47778,7 @@
 
    <li>
 
-    <p>If the third argument is present, set <a href="#the-document-s-current-address">the document's
-    current address</a> to the <a href="#absolute-url">absolute URL</a> that was
-    found earlier in this algorithm.</p>
+    <p>Set <a href="#the-document-s-current-address">the document's current address</a> to <var title="">new URL</var>.</p>
 
     <p class="note">Since this is neither a <a href="#navigate" title="navigate">navigation</a> of the <a href="#browsing-context">browsing
     context</a> nor a <a href="#traverse-the-history" title="traverse the history">history
@@ -47807,7 +47812,6 @@
   having added the new entry. (Thus the state history acts as a FIFO
   buffer for eviction, but as a LIFO buffer for navigation.)</p>
 
-
   </div><div class="example">
 
    <p>Consider a game where the user can navigate along a line, such
Received on Wednesday, 15 February 2012 20:33:10 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Wednesday, 15 February 2012 20:33:11 GMT