[giow] (1) Fix the joint session history -- the current entries of ot…

…her frames shouldn't be shown. Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=7858 git-svn-id: http://svn.whatwg.org/webapps@4209 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Oct 20, 2009 · 999725d · 999725d
1 parent a8b836f
commit 999725d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/complete.html b/complete.html
@@ -54816,7 +54816,15 @@ <h4 id=the-history-interface><span class=secno>6.10.2 </span>The <code><a href=#
   histories</a> of all <a href=#browsing-context title="browsing context">browsing
   contexts</a> of all the <a href=#fully-active>fully active</a>
   <code>Document</code> objects that share the <code><a href=#history-0>History</a></code>
-  object's <a href=#top-level-browsing-context>top-level browsing context</a>.</p>
+  object's <a href=#top-level-browsing-context>top-level browsing context</a>, with all the
+  entries that are <a href=#current-entry title="current entry">current entries</a>
+  in their respective <a href=#session-history title="session history">session
+  histories</a> removed except for the <a href=#current-entry-of-the-joint-session-history>current entry of the
+  joint session history</a>.</p>
+
+  <p>The <dfn id=current-entry-of-the-joint-session-history>current entry of the joint session history</dfn> is the
+  entry that was the most recently became a <a href=#current-entry>current entry</a>
+  in its <a href=#session-history>session history</a>.</p>
 
   <p>Entries in the <a href=#joint-session-history>joint session history</a> are ordered
   chronologically by the time they were added to their respective
@@ -54829,10 +54837,6 @@ <h4 id=the-history-interface><span class=secno>6.10.2 </span>The <code><a href=#
   subsequent entries are numbered with consecutively increasing
   integers (1, 2, 3, etc).</p>
 
-  <p>The <dfn id=current-entry-of-the-joint-session-history>current entry of the joint session history</dfn> is the
-  entry that was the most recently became a <a href=#current-entry>current entry</a>
-  in its <a href=#session-history>session history</a>.</p>
-
   <div class=impl>
 
   <p>The <dfn id=dom-history-length title=dom-history-length><code>length</code></dfn>

diff --git a/index b/index
@@ -51975,7 +51975,15 @@ NETWORK:
   histories</a> of all <a href=#browsing-context title="browsing context">browsing
   contexts</a> of all the <a href=#fully-active>fully active</a>
   <code>Document</code> objects that share the <code><a href=#history-0>History</a></code>
-  object's <a href=#top-level-browsing-context>top-level browsing context</a>.</p>
+  object's <a href=#top-level-browsing-context>top-level browsing context</a>, with all the
+  entries that are <a href=#current-entry title="current entry">current entries</a>
+  in their respective <a href=#session-history title="session history">session
+  histories</a> removed except for the <a href=#current-entry-of-the-joint-session-history>current entry of the
+  joint session history</a>.</p>
+
+  <p>The <dfn id=current-entry-of-the-joint-session-history>current entry of the joint session history</dfn> is the
+  entry that was the most recently became a <a href=#current-entry>current entry</a>
+  in its <a href=#session-history>session history</a>.</p>
 
   <p>Entries in the <a href=#joint-session-history>joint session history</a> are ordered
   chronologically by the time they were added to their respective
@@ -51988,10 +51996,6 @@ NETWORK:
   subsequent entries are numbered with consecutively increasing
   integers (1, 2, 3, etc).</p>
 
-  <p>The <dfn id=current-entry-of-the-joint-session-history>current entry of the joint session history</dfn> is the
-  entry that was the most recently became a <a href=#current-entry>current entry</a>
-  in its <a href=#session-history>session history</a>.</p>
-
   <div class=impl>
 
   <p>The <dfn id=dom-history-length title=dom-history-length><code>length</code></dfn>

diff --git a/source b/source
@@ -61779,7 +61779,15 @@ NETWORK:
   histories</span> of all <span title="browsing context">browsing
   contexts</span> of all the <span>fully active</span>
   <code>Document</code> objects that share the <code>History</code>
-  object's <span>top-level browsing context</span>.</p>
+  object's <span>top-level browsing context</span>, with all the
+  entries that are <span title="current entry">current entries</span>
+  in their respective <span title="session history">session
+  histories</span> removed except for the <span>current entry of the
+  joint session history</span>.</p>
+
+  <p>The <dfn>current entry of the joint session history</dfn> is the
+  entry that was the most recently became a <span>current entry</span>
+  in its <span>session history</span>.</p>
 
   <p>Entries in the <span>joint session history</span> are ordered
   chronologically by the time they were added to their respective
@@ -61792,10 +61800,6 @@ NETWORK:
   subsequent entries are numbered with consecutively increasing
   integers (1, 2, 3, etc).</p>
 
-  <p>The <dfn>current entry of the joint session history</dfn> is the
-  entry that was the most recently became a <span>current entry</span>
-  in its <span>session history</span>.</p>
-
   <div class="impl">
 
   <p>The <dfn title="dom-history-length"><code>length</code></dfn>