- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 31 Jan 2012 20:20:38 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv29443
Modified Files:
Overview.html
Log Message:
Turns out clearTimeout() and clearInterval() are synonyms! Who knew? Oh what a tangled Web we weave. (whatwg r6949)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.5545
retrieving revision 1.5546
diff -u -d -r1.5545 -r1.5546
--- Overview.html 31 Jan 2012 20:00:21 -0000 1.5545
+++ Overview.html 31 Jan 2012 20:20:34 -0000 1.5546
@@ -49265,8 +49265,7 @@
<li><p>If the <code><a href="#document">Document</a></code>'s <var title="concept-document-salvageable"><a href="#concept-document-salvageable">salvageable</a></var> state is
false, empty the <code><a href="#document">Document</a></code>'s <code><a href="#window">Window</a></code>'s
- <a href="#list-of-active-timeouts">list of active timeouts</a> and its <a href="#list-of-active-intervals">list of active
- intervals</a>.</li>
+ <a href="#list-of-active-timers">list of active timers</a>.</li>
</ol><h5 id="event-definition"><span class="secno">5.5.11.1 </span>Event definition</h5>
@@ -52916,24 +52915,24 @@
</p>
<p>Each object that implements the <code><a href="#windowtimers">WindowTimers</a></code>
- interface has a <dfn id="list-of-active-timeouts">list of active timeouts</dfn> and a <dfn id="list-of-active-intervals">list
- of active intervals</dfn>. Each entry in these lists is identified
- by a number, which must be unique within its list for the lifetime
- of the object that implements the <code><a href="#windowtimers">WindowTimers</a></code>
- interface.</p>
+ interface has a <dfn id="list-of-active-timers">list of active timers</dfn>. Each entry in this
+ lists is identified by a number, which must be unique within the
+ list for the lifetime of the object that implements the
+ <code><a href="#windowtimers">WindowTimers</a></code> interface.</p>
<hr><p>The <dfn id="dom-windowtimers-settimeout" title="dom-windowtimers-setTimeout"><code>setTimeout()</code></dfn>
method must run the following steps:
- <ol><li><p>Let <var title="">handle</var> be a user-agent-defined integer
- that is greater than zero that will identify the timeout to be set
- by this call.</li>
+ <ol><li><p>Let <var title="">handle</var> be a user-agent-defined
+ integer that is greater than zero that will identify the timeout to
+ be set by this call in the <a href="#list-of-active-timers">list of active
+ timers</a>.</li>
- <li><p>Add an entry to the <a href="#list-of-active-timeouts">list of active timeouts</a> for
+ <li><p>Add an entry to the <a href="#list-of-active-timers">list of active timers</a> for
<var title="">handle</var>.</li>
- <li><p><a href="#get-the-timed-task">Get the timed task</a> <var title="">handle</var> in
- the <a href="#list-of-active-timeouts">list of active timeouts</a>, and let <var title="">task</var> be the result.</li>
+ <li><p><a href="#get-the-timed-task">Get the timed task</a> <var title="">handle</var>
+ in the <a href="#list-of-active-timers">list of active timers</a>, and let <var title="">task</var> be the result.</li>
<li><p>Let <var title="">timeout</var> be the second argument to
the method, or zero if the argument was omitted.</li>
@@ -53010,28 +53009,19 @@
<li><p><a href="#queue-a-task" title="queue a task">Queue</a> the <var title="">task</var> <a href="#concept-task" title="concept-task">task</a>.</li>
- </ol><p>The <dfn id="dom-windowtimers-cleartimeout" title="dom-windowtimers-clearTimeout"><code>clearTimeout()</code></dfn>
- method must clear the entry identified as <var title="">handle</var>
- from the <a href="#list-of-active-timeouts">list of active timeouts</a> of the
- <code><a href="#windowtimers">WindowTimers</a></code> object on which the method was invoked,
- where <var title="">handle</var> is the argument passed to the
- method, if any. (If <var title="">handle</var> does not identify an
- entry in the <a href="#list-of-active-timeouts">list of active timeouts</a> of the
- <code><a href="#windowtimers">WindowTimers</a></code> object on which the method was invoked,
- the method does nothing.)</p>
-
- <hr><p>The <dfn id="dom-windowtimers-setinterval" title="dom-windowtimers-setInterval"><code>setInterval()</code></dfn>
+ </ol><hr><p>The <dfn id="dom-windowtimers-setinterval" title="dom-windowtimers-setInterval"><code>setInterval()</code></dfn>
method must run the following steps:
- <ol><li><p>Let <var title="">handle</var> be a user-agent-defined integer
- that is greater than zero that will identify the interval to be set
- by this call.</li>
+ <ol><li><p>Let <var title="">handle</var> be a user-agent-defined
+ integer that is greater than zero that will identify the timeout to
+ be set by this call in the <a href="#list-of-active-timers">list of active
+ timers</a>.</li>
- <li><p>Add an entry to the <a href="#list-of-active-intervals">list of active intervals</a> for
+ <li><p>Add an entry to the <a href="#list-of-active-timers">list of active timers</a> for
<var title="">handle</var>.</li>
- <li><p><a href="#get-the-timed-task">Get the timed task</a> <var title="">handle</var> in
- the <a href="#list-of-active-intervals">list of active intervals</a>, and let <var title="">task</var> be the result.</li>
+ <li><p><a href="#get-the-timed-task">Get the timed task</a> <var title="">handle</var>
+ in the <a href="#list-of-active-timers">list of active timers</a>, and let <var title="">task</var> be the result.</li>
<li><p>Let <var title="">timeout</var> be the second argument to
the method, or zero if the argument was omitted.</li>
@@ -53081,13 +53071,13 @@
<li><p>Return to the step labeled <i>wait</i>.</li>
- </ol><p>The <dfn id="dom-windowtimers-clearinterval" title="dom-windowtimers-clearInterval"><code>clearInterval()</code></dfn>
- method must clear the entry identified as <var title="">handle</var>
- from the <a href="#list-of-active-intervals">list of active intervals</a> of the
- <code><a href="#windowtimers">WindowTimers</a></code> object on which the method was invoked,
- where <var title="">handle</var> is the argument passed to the
- method, if any. (If <var title="">handle</var> does not identify an
- entry in the <a href="#list-of-active-intervals">list of active intervals</a> of the
+ </ol><hr><p>The <dfn id="dom-windowtimers-cleartimeout" title="dom-windowtimers-clearTimeout"><code>clearTimeout()</code></dfn>
+ and <dfn id="dom-windowtimers-clearinterval" title="dom-windowtimers-clearInterval"><code>clearInterval()</code></dfn>
+ methods must clear the entry identified as <var title="">handle</var> from the <a href="#list-of-active-timers">list of active timers</a> of
+ the <code><a href="#windowtimers">WindowTimers</a></code> object on which the method was
+ invoked, where <var title="">handle</var> is the argument passed to
+ the method, if any. (If <var title="">handle</var> does not identify
+ an entry in the <a href="#list-of-active-timers">list of active timers</a> of the
<code><a href="#windowtimers">WindowTimers</a></code> object on which the method was invoked,
the method does nothing.)</p>
Received on Tuesday, 31 January 2012 20:20:49 UTC