Browse files

[c] (0) Change the content model of <menu> to be simpler.

git-svn-id: http://svn.whatwg.org/webapps@2416 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information...
1 parent bdcd52a commit 179f37b6ee279abe6fbc157445134733e3802635 @Hixie Hixie committed Nov 18, 2008
Showing with 12 additions and 16 deletions.
  1. +6 −8 index
  2. +6 −8 source
View
14 index
@@ -11337,11 +11337,8 @@ I first lived there):&lt;/p&gt;
<dd>Inside <code><a href=#the-ul-element>ul</a></code> elements.</dd>
<dd>Inside <code><a href=#menus>menu</a></code> elements.</dd>
<dt>Content model:</dt>
- <dd>When the element is a child of a <code><a href=#menus>menu</a></code> element: <a href=#phrasing-content-0>phrasing content</a>.</dd>
-<!--XXXSPAN
- <dd>When the element is a child of an <code>ol</code> or <code>ul/code> element that is itself the child of a <code>span</code> element: <span>phrasing content</span>.</dd>
--->
- <dd>Otherwise: <a href=#flow-content-0>flow content</a>.</dd>
+ <dd><!--XXXSPANWhen the element is a child of an <code>ol</code> or <code>ul/code> element that is itself the child of a <code>span</code> element: <span>phrasing content</span>.</dd>
+ <dd>Otherwise: --><a href=#flow-content-0>flow content</a>.</dd>
<dt>Element-specific attributes:</dt>
<dd>If the element is a child of an <code><a href=#the-ol-element>ol</a></code> element: <code title=attr-li-value><a href=#attr-li-value>value</a></code></dd>
<dd>If the element is not the child of an <code><a href=#the-ol-element>ol</a></code> element: None.</dd>
@@ -30910,13 +30907,11 @@ menu li:not(:first-child)::before { content: ' | '; }</pre>
<dl class=element><dt>Categories</dt>
<dd><a href=#flow-content-0>Flow content</a>.</dd>
<dd>If the element's <code title=attr-menu-type><a href=#attr-menu-type>type</a></code> attribute is in the <a href=#tool-bar-state title="tool bar state">tool bar</a> state: <a href=#interactive-content-0>Interactive content</a>.</dd>
- <dd>If there is a <code><a href=#menus>menu</a></code> element ancestor: <a href=#phrasing-content-0>phrasing content</a>.</dd>
<dt>Contexts in which this element may be used:</dt>
<dd>Where <a href=#flow-content-0>flow content</a> is expected.</dd>
- <dd>If there is a <code><a href=#menus>menu</a></code> element ancestor: where <a href=#phrasing-content-0>phrasing content</a> is expected.</dd>
<dt>Content model:</dt>
<dd>Either: Zero or more <code><a href=#the-li-element>li</a></code> elements.</dd>
- <dd>Or: <a href=#phrasing-content-0>Phrasing content</a>.</dd>
+ <dd>Or: <a href=#flow-content-0>Flow content</a>.</dd>
<dt>Element-specific attributes:</dt>
<dd><code title=attr-menu-type><a href=#attr-menu-type>type</a></code></dd>
<dd><code title=attr-menu-label><a href=#attr-menu-label>label</a></code></dd>
@@ -31065,6 +31060,9 @@ menu li:not(:first-child)::before { content: ' | '; }</pre>
</menu>
</form>
+
+explain that only direct children of the <menu> matter
+
-->
View
14 source
@@ -12054,11 +12054,8 @@ I first lived there):&lt;/p>
<dd>Inside <code>ul</code> elements.</dd>
<dd>Inside <code>menu</code> elements.</dd>
<dt>Content model:</dt>
- <dd>When the element is a child of a <code>menu</code> element: <span>phrasing content</span>.</dd>
-<!--XXXSPAN
- <dd>When the element is a child of an <code>ol</code> or <code>ul/code> element that is itself the child of a <code>span</code> element: <span>phrasing content</span>.</dd>
--->
- <dd>Otherwise: <span>flow content</span>.</dd>
+ <dd><!--XXXSPANWhen the element is a child of an <code>ol</code> or <code>ul/code> element that is itself the child of a <code>span</code> element: <span>phrasing content</span>.</dd>
+ <dd>Otherwise: --><span>flow content</span>.</dd>
<dt>Element-specific attributes:</dt>
<dd>If the element is a child of an <code>ol</code> element: <code title="attr-li-value">value</code></dd>
<dd>If the element is not the child of an <code>ol</code> element: None.</dd>
@@ -35126,13 +35123,11 @@ menu li:not(:first-child)::before { content: ' | '; }</pre>
<dt>Categories</dt>
<dd><span>Flow content</span>.</dd>
<dd>If the element's <code title="attr-menu-type">type</code> attribute is in the <span title="tool bar state">tool bar</span> state: <span>Interactive content</span>.</dd>
- <dd>If there is a <code>menu</code> element ancestor: <span>phrasing content</span>.</dd>
<dt>Contexts in which this element may be used:</dt>
<dd>Where <span>flow content</span> is expected.</dd>
- <dd>If there is a <code>menu</code> element ancestor: where <span>phrasing content</span> is expected.</dd>
<dt>Content model:</dt>
<dd>Either: Zero or more <code>li</code> elements.</dd>
- <dd>Or: <span>Phrasing content</span>.</dd>
+ <dd>Or: <span>Flow content</span>.</dd>
<dt>Element-specific attributes:</dt>
<dd><code title="attr-menu-type">type</code></dd>
<dd><code title="attr-menu-label">label</code></dd>
@@ -35293,6 +35288,9 @@ menu li:not(:first-child)::before { content: ' | '; }</pre>
</menu>
</form>
+
+explain that only direct children of the <menu> matter
+
-->

0 comments on commit 179f37b

Please sign in to comment.