[html5] r7882 - [giow] (3) Keep pages in history even if they were still loaded when the user na [...]

[whatwg at whatwg.org]

Author: ianh
Date: 2013-05-31 13:30:11 -0700 (Fri, 31 May 2013)
New Revision: 7882

Modified:
   complete.html
   index
   source
Log:
[giow] (3) Keep pages in history even if they were still loaded when the user navigated away (but still not if a script did it on its own).
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=17041
Affected topics: DOM APIs

Modified: complete.html
===================================================================
--- complete.html	2013-05-31 20:13:13 UTC (rev 7881)
+++ complete.html	2013-05-31 20:30:11 UTC (rev 7882)
@@ -66740,8 +66740,24 @@
 
    </li>
 
-   <li><p>If the <code><a href=#location>Location</a></code> object's <i>relevant <code><a href=#document>Document</a></code></i> has
-   <a href=#completely-loaded>completely loaded</a>, then act as if the <code title=dom-location-assign><a href=#dom-location-assign>assign()</a></code> method had been called with the new value as its
+   <li>
+
+    <p>If any of the following conditions are met, let <var title="">mode</var> be <i>normal
+    navigation</i>; otherwise, let it be <i>replace navigation</i>:</p>
+
+    <ul class=brief><li>The <code><a href=#location>Location</a></code> object's <i>relevant <code><a href=#document>Document</a></code></i> has
+     <a href=#completely-loaded>completely loaded</a>, or</li>
+
+     <li>In the <a href=#concept-task title=concept-task>task</a> in which the algorithm is running, an
+     <a href=#activation-behavior>activation behavior</a> is currently being processed whose <code title=event-click><a href=#event-click>click</a></code> event was <a href=#concept-events-trusted title=concept-events-trusted>trusted</a>,
+     or</li>
+
+     <li>In the <a href=#concept-task title=concept-task>task</a> in which the algorithm is running, the event
+     listener for a <a href=#concept-events-trusted title=concept-events-trusted>trusted</a> <code title=event-click><a href=#event-click>click</a></code> event is being handled.</li>
+
+    </ul></li>
+
+   <li><p>If <var title="">mode</var> is <i>normal navigation</i>, then act as if the <code title=dom-location-assign><a href=#dom-location-assign>assign()</a></code> method had been called with the new value as its
    argument. Otherwise, act as if the <code title=dom-location-replace><a href=#dom-location-replace>replace()</a></code> method had
    been called with the new value as its argument.</li>
    <!--DONAV location.href, defined in terms of the paragraphs far above-->

Modified: index
===================================================================
--- index	2013-05-31 20:13:13 UTC (rev 7881)
+++ index	2013-05-31 20:30:11 UTC (rev 7882)
@@ -66740,8 +66740,24 @@
 
    </li>
 
-   <li><p>If the <code><a href=#location>Location</a></code> object's <i>relevant <code><a href=#document>Document</a></code></i> has
-   <a href=#completely-loaded>completely loaded</a>, then act as if the <code title=dom-location-assign><a href=#dom-location-assign>assign()</a></code> method had been called with the new value as its
+   <li>
+
+    <p>If any of the following conditions are met, let <var title="">mode</var> be <i>normal
+    navigation</i>; otherwise, let it be <i>replace navigation</i>:</p>
+
+    <ul class=brief><li>The <code><a href=#location>Location</a></code> object's <i>relevant <code><a href=#document>Document</a></code></i> has
+     <a href=#completely-loaded>completely loaded</a>, or</li>
+
+     <li>In the <a href=#concept-task title=concept-task>task</a> in which the algorithm is running, an
+     <a href=#activation-behavior>activation behavior</a> is currently being processed whose <code title=event-click><a href=#event-click>click</a></code> event was <a href=#concept-events-trusted title=concept-events-trusted>trusted</a>,
+     or</li>
+
+     <li>In the <a href=#concept-task title=concept-task>task</a> in which the algorithm is running, the event
+     listener for a <a href=#concept-events-trusted title=concept-events-trusted>trusted</a> <code title=event-click><a href=#event-click>click</a></code> event is being handled.</li>
+
+    </ul></li>
+
+   <li><p>If <var title="">mode</var> is <i>normal navigation</i>, then act as if the <code title=dom-location-assign><a href=#dom-location-assign>assign()</a></code> method had been called with the new value as its
    argument. Otherwise, act as if the <code title=dom-location-replace><a href=#dom-location-replace>replace()</a></code> method had
    been called with the new value as its argument.</li>
    <!--DONAV location.href, defined in terms of the paragraphs far above-->

Modified: source
===================================================================
--- source	2013-05-31 20:13:13 UTC (rev 7881)
+++ source	2013-05-31 20:30:11 UTC (rev 7882)
@@ -74660,8 +74660,30 @@
 
    </li>
 
-   <li><p>If the <code>Location</code> object's <i>relevant <code>Document</code></i> has
-   <span>completely loaded</span>, then act as if the <code
+   <li>
+
+    <p>If any of the following conditions are met, let <var title="">mode</var> be <i>normal
+    navigation</i>; otherwise, let it be <i>replace navigation</i>:</p>
+
+    <ul class="brief">
+
+     <li>The <code>Location</code> object's <i>relevant <code>Document</code></i> has
+     <span>completely loaded</span>, or</li>
+
+     <li>In the <span title="concept-task">task</span> in which the algorithm is running, an
+     <span>activation behavior</span> is currently being processed whose <code
+     title="event-click">click</code> event was <span title="concept-events-trusted">trusted</span>,
+     or</li>
+
+     <li>In the <span title="concept-task">task</span> in which the algorithm is running, the event
+     listener for a <span title="concept-events-trusted">trusted</span> <code
+     title="event-click">click</code> event is being handled.</li>
+
+    </ul>
+
+   </li>
+
+   <li><p>If <var title="">mode</var> is <i>normal navigation</i>, then act as if the <code
    title="dom-location-assign">assign()</code> method had been called with the new value as its
    argument. Otherwise, act as if the <code title="dom-location-replace">replace()</code> method had
    been called with the new value as its argument.</p></li>