- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 11 Jan 2011 23:24:40 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv3099
Modified Files:
Overview.html
Log Message:
Improve the accuracy of the <meta> refresh stuff. (whatwg r5776)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4638
retrieving revision 1.4639
diff -u -d -r1.4638 -r1.4639
--- Overview.html 11 Jan 2011 21:12:35 -0000 1.4638
+++ Overview.html 11 Jan 2011 23:24:36 -0000 1.4639
@@ -12028,7 +12028,7 @@
<div class="impl">
- <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><li><p>If another <code><a href="#meta">meta</a></code> element with an <code title="attr-meta-http-equiv"><a href="#attr-meta-http-equiv">http-equiv</a></code> attribute in the
+ <ol><!-- TESTS: http://www.hixie.ch/tests/adhoc/html/meta/refresh/ --><!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/734 --><li><p>If another <code><a href="#meta">meta</a></code> element with an <code title="attr-meta-http-equiv"><a href="#attr-meta-http-equiv">http-equiv</a></code> attribute in the
<a href="#attr-meta-http-equiv-refresh" title="attr-meta-http-equiv-refresh">Refresh state</a>
has already been successfully processed (i.e. when it was
inserted the user agent processed it and reached the last step of
@@ -12125,16 +12125,36 @@
<p>Perform one or more of the following steps:</p>
- <ul><li><p>Set a timer so that in <var title="">time</var> seconds,
- adjusted to take into account user or user agent preferences,
- if the user has not canceled the redirect and if the
- <code><a href="#meta">meta</a></code> element's <code><a href="#document">Document</a></code>'s
- <a href="#browsing-context">browsing context</a> did not have the <a href="#sandboxed-automatic-features-browsing-context-flag">sandboxed
- automatic features browsing context flag</a> set when the
- <code><a href="#document">Document</a></code> was created, the user agent <a href="#navigate" title="navigate">navigates</a><!--DONAV meta refresh--> the
- <code><a href="#document">Document</a></code>'s <a href="#browsing-context">browsing context</a> to <var title="">url</var>, with <a href="#replacement-enabled">replacement enabled</a>, and
- with the <code><a href="#document">Document</a></code>'s <a href="#browsing-context">browsing context</a>
- as the <a href="#source-browsing-context">source browsing context</a>.</li>
+ <ul><li>
+
+ <p>After the refresh has come due (as defined below), if the
+ user has not canceled the redirect and if the
+ <code><a href="#meta">meta</a></code> element's <code><a href="#document">Document</a></code>'s
+ <a href="#browsing-context">browsing context</a> did not have the <a href="#sandboxed-automatic-features-browsing-context-flag">sandboxed
+ automatic features browsing context flag</a> set when the
+ <code><a href="#document">Document</a></code> was created, <a href="#navigate" title="navigate">navigate</a><!--DONAV meta refresh--> the
+ <code><a href="#document">Document</a></code>'s <a href="#browsing-context">browsing context</a> to <var title="">url</var>, with <a href="#replacement-enabled">replacement enabled</a>, and
+ with the <code><a href="#document">Document</a></code>'s <a href="#browsing-context">browsing context</a>
+ as the <a href="#source-browsing-context">source browsing context</a>.</p>
+
+ <p>For the purposes of the previous paragraph, a refresh is
+ said to have come due as soon as the <em>later</em> of the
+ following two conditions occurs:</p>
+
+ <ul><li>At least <var title="">time</var> seconds have elapsed
+ since the document has <a href="#completely-loaded">completely loaded</a>,
+ adjusted to take into account user or user agent
+ preferences.</li>
+ <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/774 -->
+
+ <li>At least <var title="">time</var> seconds have elapsed
+ since the <code><a href="#meta">meta</a></code> element was <a href="#insert-an-element-into-a-document" title="insert
+ an element into a document">inserted into the
+ <code>Document</code></a>, adjusted to take into account
+ user or user agent preferences.</li>
+ <!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/772 -->
+
+ </ul></li>
<li><p>Provide the user with an interface that, when selected,
<a href="#navigate" title="navigate">navigates</a><!--DONAV meta
Received on Tuesday, 11 January 2011 23:24:43 UTC