Skip to content

Commit 8fb8485

Browse files
committed
Make <menuitem> parse like an unknown element
Fixes #2308.
1 parent 763e918 commit 8fb8485

File tree

1 file changed

+27
-23
lines changed

1 file changed

+27
-23
lines changed

source

Lines changed: 27 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55810,25 +55810,25 @@ interface <dfn>HTMLMenuElement</dfn> : <span>HTMLElement</span> {
5581055810
&lt;li>
5581155811
&lt;button type=menu value="File" menu="filemenu">
5581255812
&lt;menu id="filemenu" type="context">
55813-
&lt;menuitem onclick="fnew()" label="New...">
55814-
&lt;menuitem onclick="fopen()" label="Open...">
55815-
&lt;menuitem onclick="fsave()" label="Save">
55816-
&lt;menuitem onclick="fsaveas()" label="Save as...">
55813+
&lt;menuitem onclick="fnew()" label="New...">&lt;/menuitem>
55814+
&lt;menuitem onclick="fopen()" label="Open...">&lt;/menuitem>
55815+
&lt;menuitem onclick="fsave()" label="Save">&lt;/menuitem>
55816+
&lt;menuitem onclick="fsaveas()" label="Save as...">&lt;/menuitem>
5581755817
&lt;/menu>
5581855818
&lt;/li>
5581955819
&lt;li>
5582055820
&lt;button type=menu value="Edit" menu="editmenu">
5582155821
&lt;menu id="editmenu" type="context">
55822-
&lt;menuitem onclick="ecopy()" label="Copy">
55823-
&lt;menuitem onclick="ecut()" label="Cut">
55824-
&lt;menuitem onclick="epaste()" label="Paste">
55822+
&lt;menuitem onclick="ecopy()" label="Copy">&lt;/menuitem>
55823+
&lt;menuitem onclick="ecut()" label="Cut">&lt;/menuitem>
55824+
&lt;menuitem onclick="epaste()" label="Paste">&lt;/menuitem>
5582555825
&lt;/menu>
5582655826
&lt;/li>
5582755827
&lt;li>
5582855828
&lt;button type=menu value="Help" menu="helpmenu">
5582955829
&lt;menu id="helpmenu" type="context">
55830-
&lt;menuitem onclick="location='help.html'" label="Help">
55831-
&lt;menuitem onclick="location='about.html'" label="About">
55830+
&lt;menuitem onclick="location='help.html'" label="Help">&lt;/menuitem>
55831+
&lt;menuitem onclick="location='about.html'" label="About">&lt;/menuitem>
5583255832
&lt;/menu>
5583355833
&lt;/li>
5583455834
&lt;/menu></pre>
@@ -56059,14 +56059,14 @@ interface <dfn>HTMLMenuItemElement</dfn> : <span>HTMLElement</span> {
5605956059
<pre>&lt;button type=menu menu=editmenu>Commands...&lt;/button>
5606056060
&lt;menu type="context" id="editmenu">
5606156061
&lt;menuitem type="radio" radiogroup="alignment" checked="checked"
56062-
label="Left" icon="icons/alL.png" onclick="setAlign('left')">
56062+
label="Left" icon="icons/alL.png" onclick="setAlign('left')">&lt;/menuitem>
5606356063
&lt;menuitem type="radio" radiogroup="alignment"
56064-
label="Center" icon="icons/alC.png" onclick="setAlign('center')">
56064+
label="Center" icon="icons/alC.png" onclick="setAlign('center')">&lt;/menuitem>
5606556065
&lt;menuitem type="radio" radiogroup="alignment"
56066-
label="Right" icon="icons/alR.png" onclick="setAlign('right')">
56066+
label="Right" icon="icons/alR.png" onclick="setAlign('right')">&lt;/menuitem>
5606756067
&lt;hr>
5606856068
&lt;menuitem type="command" disabled
56069-
label="Publish" icon="icons/pub.png" onclick="publish()">
56069+
label="Publish" icon="icons/pub.png" onclick="publish()">&lt;/menuitem>
5607056070
&lt;/menu></pre>
5607156071

5607256072
</div>
@@ -56093,8 +56093,12 @@ interface <dfn>HTMLMenuItemElement</dfn> : <span>HTMLElement</span> {
5609356093
<pre>&lt;form name="npc">
5609456094
&lt;label>Character name: &lt;input name=char type=text contextmenu=namemenu required>&lt;/label>
5609556095
&lt;menu type=context id=namemenu>
56096-
&lt;menuitem label="Pick random name" onclick="document.forms.npc.elements.char.value = getRandomName()">
56097-
&lt;menuitem label="Prefill other fields based on name" onclick="prefillFields(document.forms.npc.elements.char.value)">
56096+
&lt;menuitem onclick="document.forms.npc.elements.char.value = getRandomName()">
56097+
Pick random name
56098+
&lt;/menuitem>
56099+
&lt;menuitem onclick="prefillFields(document.forms.npc.elements.char.value)">
56100+
Prefill other fields based on name
56101+
&lt;/menuitem>
5609856102
&lt;/menu>
5609956103
&lt;/form></pre>
5610056104

@@ -56201,11 +56205,11 @@ interface <dfn>HTMLMenuItemElement</dfn> : <span>HTMLElement</span> {
5620156205

5620256206
<pre>&lt;img src="cats.jpeg" alt="Cats" contextmenu=catsmenu>
5620356207
&lt;menu type="context" id="catsmenu">
56204-
&lt;menuitem label="Pet the kittens" onclick="kittens.pet()">
56205-
&lt;menuitem label="Cuddle with the kittens" onclick="kittens.cuddle()">
56208+
&lt;menuitem label="Pet the kittens" onclick="kittens.pet()">&lt;/menuitem>
56209+
&lt;menuitem label="Cuddle with the kittens" onclick="kittens.cuddle()">&lt;/menuitem>
5620656210
&lt;menu label="Feed the kittens"><!-- note: contents of this submenu aren't visible in the pictures below -->
56207-
&lt;menuitem label="Fish" onclick="kittens.feed(fish)">
56208-
&lt;menuitem label="Chicken" onclick="kittens.feed(chicken)">
56211+
&lt;menuitem label="Fish" onclick="kittens.feed(fish)">&lt;/menuitem>
56212+
&lt;menuitem label="Chicken" onclick="kittens.feed(chicken)">&lt;/menuitem>
5620956213
&lt;/menu>
5621056214
&lt;/menu></pre>
5621156215

@@ -105469,7 +105473,7 @@ document.body.appendChild(text);
105469105473

105470105474
</dd>
105471105475

105472-
<dt>A start tag whose tag name is one of: "menuitem", "param", "source", "track"</dt>
105476+
<dt>A start tag whose tag name is one of: "param", "source", "track"</dt>
105473105477
<dd>
105474105478

105475105479
<p><span>Insert an HTML element</span> for the token. Immediately pop the <span>current
@@ -108416,9 +108420,9 @@ document.body.appendChild(text);
108416108420
<p>If <var>current node</var> is an <code>area</code>, <code>base</code>,
108417108421
<code>basefont</code>, <code>bgsound</code>, <code>br</code>, <code>col</code>,
108418108422
<code>embed</code>, <code>frame</code>, <code>hr</code>, <code>img</code>,
108419-
<code>input</code>, <code>keygen</code>, <code>link</code>, <code>menuitem</code>,
108420-
<code>meta</code>, <code>param</code>, <code>source</code>, <code>track</code> or
108421-
<code>wbr</code> element, then continue on to the next child node at this point.</p>
108423+
<code>input</code>, <code>keygen</code>, <code>link</code>, <code>meta</code>,
108424+
<code>param</code>, <code>source</code>, <code>track</code> or <code>wbr</code> element,
108425+
then continue on to the next child node at this point.</p>
108422108426
<!-- VOIDLIST superset -->
108423108427
<!-- also, i guess: image, but we don't list it because we don't consider it an "element",
108424108428
more a "macro", and thus we should never serialize it -->

0 commit comments

Comments
 (0)