[html5] r846 - /
whatwg at whatwg.org
whatwg at whatwg.org
Thu May 31 16:20:00 PDT 2007
Author: ianh
Date: 2007-05-31 16:19:59 -0700 (Thu, 31 May 2007)
New Revision: 846
Modified:
index
source
Log:
[] (0) Clarify the <datagrid> content model, allow <datalist> as well as <select>.
Modified: index
===================================================================
--- index 2007-05-25 03:54:26 UTC (rev 845)
+++ index 2007-05-31 23:19:59 UTC (rev 846)
@@ -22,7 +22,7 @@
<h1 id=html-5>HTML 5</h1>
- <h2 class="no-num no-toc" id=working>Working Draft — 25 May 2007</h2>
+ <h2 class="no-num no-toc" id=working>Working Draft — 31 May 2007</h2>
<p>You can take part in this work. <a
href="http://www.whatwg.org/mailing-list">Join the working group's
@@ -16648,15 +16648,15 @@
hyperlinks">follow hyperlinks</a> created using the <code><a
href="#area">area</a></code> element, as described in the next section,
the <code title=attr-hyperlink-href><a href="#href6">href</a></code>,
- <code><code title=attr-hyperlink-target><a
- href="#target3">target</a></code> and <code title=attr-hyperlink-ping><a
- href="#ping">ping</a></code> attributes decide how the link is followed.
- The <code title=attr-hyperlink-rel><a href="#rel3">rel</a></code>, <code
- title=attr-hyperlink-media><a href="#media12">media</a></code>, <code
- title=attr-hyperlink-hreflang><a href="#hreflang3">hreflang</a></code>,
- and <code title=attr-hyperlink-type><a href="#type17">type</a></code>
- attributes may be used to indicate to the user the likely nature of the
- target resource before the user follows the link.</code>
+ <code title=attr-hyperlink-target><a href="#target3">target</a></code> and
+ <code title=attr-hyperlink-ping><a href="#ping">ping</a></code> attributes
+ decide how the link is followed. The <code title=attr-hyperlink-rel><a
+ href="#rel3">rel</a></code>, <code title=attr-hyperlink-media><a
+ href="#media12">media</a></code>, <code title=attr-hyperlink-hreflang><a
+ href="#hreflang3">hreflang</a></code>, and <code
+ title=attr-hyperlink-type><a href="#type17">type</a></code> attributes may
+ be used to indicate to the user the likely nature of the target resource
+ before the user follows the link.
<p>The <code title=attr-hyperlink-target><a
href="#target3">target</a></code>, <code title=attr-hyperlink-ping><a
@@ -19340,8 +19340,17 @@
<dt>Content model:
- <dd>Zero or more <a href="#block-level0">block-level elements</a>.
+ <dd>Either: Nothing.
+ <dd>Or: One or more <a href="#block-level0">block-level elements</a>, the
+ first of which is not a <code><a href="#table">table</a></code> element.
+
+ <dd>Or: A single <code><a href="#table">table</a></code> element.
+
+ <dd>Or: A single <code>select</code> element.
+
+ <dd>Or: A single <code>datalist</code> element.
+
<dt>Element-specific attributes:
<dd><code title=attr-datagrid-multiple><a
@@ -19962,7 +19971,7 @@
<dl class=switch>
<dt>While the first element child is a <code><a
- href="#table">table</a></code>
+ href="#table">table</a></code> element
<dd>
<p><strong><code title=dom-provider-getRowCount><a
@@ -20176,7 +20185,8 @@
href="#updateeverything">updateEverything()</a></code> if the change did
affect the sort order.</p>
- <dt>While the first element child is a <code>select</code>
+ <dt>While the first element child is a <code>select</code> or
+ <code>datalist</code> element
<dd>
<p>The default data provider must return 1 for the column count, the
@@ -20184,10 +20194,11 @@
the column's classes.</p>
<p>For the rows, assume the existence of a node filter view of the
- descendants of the first <code>select</code> element child of the
- <code><a href="#datagrid0">datagrid</a></code> element, that skips all
- nodes other than <code>optgroup</code> and <code>option</code> elements,
- as well as any descendents of any <code>option</code> elements.</p>
+ descendants of the first element child of the <code><a
+ href="#datagrid0">datagrid</a></code> element (the <code>select</code>
+ or <code>datalist</code> element), that skips all nodes other than
+ <code>optgroup</code> and <code>option</code> elements, as well as any
+ descendents of any <code>option</code> elements.</p>
<p>Given a path <var title="">row</var>, the corresponding element is the
one obtained by drilling into the view, taking the child given by the
@@ -20234,8 +20245,8 @@
<p><code title=dom-provider-getChildAtPosition><a
href="#getchildatposition">getChildAtPosition(<var title="">row</var>,
<var title="">position</var>)</a></code> must return <var
- title="">position</var>. (The <code>select</code> default data provider
- does not support sorting the data grid.)</p>
+ title="">position</var>. (The <code>select</code>/<code>datalist</code>
+ default data provider does not support sorting the data grid.)</p>
<p><code title=dom-provider-getRowImage><a
href="#getrowimage">getRowImage(<var title="">i</var>)</a></code> must
@@ -20454,10 +20465,11 @@
</span>Common default data provider method definitions for cells</h6>
<p>These definitions are used for the cell-specific methods of the default
- data providers (other than in the <code>select</code> case). How they
- behave is based on the contents of an element that represents the cell
- given by their first two arguments. Which element that is is defined in
- the previous section.
+ data providers (other than in the
+ <code>select</code>/<code>datalist</code> case). How they behave is based
+ on the contents of an element that represents the cell given by their
+ first two arguments. Which element that is is defined in the previous
+ section.
<dl>
<dt>Cyclable cells
Modified: source
===================================================================
--- source 2007-05-25 03:54:26 UTC (rev 845)
+++ source 2007-05-31 23:19:59 UTC (rev 846)
@@ -14338,7 +14338,7 @@
<p>When user agents allow users to <span title="following
hyperlinks">follow hyperlinks</span> created using the
<code>area</code> element, as described in the next section, the
- <code title="attr-hyperlink-href">href</code>, <code
+ <code title="attr-hyperlink-href">href</code>,
<code title="attr-hyperlink-target">target</code> and <code
title="attr-hyperlink-ping">ping</code> attributes decide how the
link is followed. The <code title="attr-hyperlink-rel">rel</code>,
@@ -17144,7 +17144,11 @@
<dd>Where <span>block-level elements</span> are expected, if
there are no ancestor <span>interactive elements</span>.</dd>
<dt>Content model:</dt>
- <dd>Zero or more <span>block-level elements</span>.</dd>
+ <dd>Either: Nothing.</dd>
+ <dd>Or: One or more <span>block-level elements</span>, the first of which is not a <code>table</code> element.</dd>
+ <dd>Or: A single <code>table</code> element.</dd>
+ <dd>Or: A single <code>select</code> element.</dd>
+ <dd>Or: A single <code>datalist</code> element.</dd>
<dt>Element-specific attributes:</dt>
<dd><code title="attr-datagrid-multiple">multiple</code></dd>
<dd><code title="attr-datagrid-disabled">disabled</code></dd>
@@ -17677,7 +17681,7 @@
<dl class="switch">
- <dt>While the first element child is a <code>table</code></dt>
+ <dt>While the first element child is a <code>table</code> element</dt>
<dd>
@@ -17880,7 +17884,7 @@
</dd>
- <dt>While the first element child is a <code>select</code></dt>
+ <dt>While the first element child is a <code>select</code> or <code>datalist</code> element</dt>
<dd>
@@ -17889,8 +17893,9 @@
classes to the column's classes.</p>
<p>For the rows, assume the existence of a node filter view of the
- descendants of the first <code>select</code> element child of the
- <code>datagrid</code> element, that skips all nodes other than
+ descendants of the first element child of the
+ <code>datagrid</code> element (the <code>select</code> or
+ <code>datalist</code> element), that skips all nodes other than
<code>optgroup</code> and <code>option</code> elements, as well as
any descendents of any <code>option</code> elements.</p>
@@ -17941,8 +17946,9 @@
<p><code
title="dom-provider-getChildAtPosition">getChildAtPosition(<var
title="">row</var>, <var title="">position</var>)</code> must
- return <var title="">position</var>. (The <code>select</code>
- default data provider does not support sorting the data grid.)</p>
+ return <var title="">position</var>. (The
+ <code>select</code>/<code>datalist</code> default data provider
+ does not support sorting the data grid.)</p>
<p><code title="dom-provider-getRowImage">getRowImage(<var
title="">i</var>)</code> must return the empty string, <code
@@ -18167,10 +18173,11 @@
provider method definitions for cells</h6>
<p>These definitions are used for the cell-specific methods of the
- default data providers (other than in the <code>select</code> case).
- How they behave is based on the contents of an element that
- represents the cell given by their first two arguments. Which
- element that is is defined in the previous section.</p>
+ default data providers (other than in the
+ <code>select</code>/<code>datalist</code> case). How they behave is
+ based on the contents of an element that represents the cell given
+ by their first two arguments. Which element that is is defined in
+ the previous section.</p>
<dl>
More information about the Commit-Watchers
mailing list