[] (0) contextmenu='' inherits; also, fix markup error in last checkin

git-svn-id: http://svn.whatwg.org/webapps@3301 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jun 17, 2009 · 78b6a7a · 78b6a7a
1 parent 433d4b9
commit 78b6a7a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 35 deletions.
diff --git a/index b/index
@@ -37963,9 +37963,9 @@ interface <dfn id=renderingcontext2dcallback>RenderingContext2DCallback</dfn> {
   void <span title="dom-listener-performAction">performAction</span>(in <span>RowID</span> row, in DOMString action);
 -->};</pre>
 
-  <p>The <code>DataGridDataProvider</code> interface, once implemented
-  by an object in a script and hooked up to a <code><a href=#datagrid>datagrid</a></code>
-  using the <dfn id=dom-datagrid-data title=dom-datagrid-data><code>data</code></dfn> DOM
+  <p>The <code><a href=#datagridlistener>DataGridListener</a></code> interface, once implemented by
+  an object in a script and hooked up to a <code><a href=#datagrid>datagrid</a></code> using
+  the <code title=dom-datagrid-listener><a href=#dom-datagrid-listener>listener</a></code> DOM
   attribute, receives notifications when the <code><a href=#datagrid>datagrid</a></code>
   needs information (such as which rows exist) for display.</p>
 
@@ -38818,6 +38818,7 @@ explain that only direct children of the <menu> matter
    <dd>Append a separator to the menu, then iterate over the children
    of the <code><a href=#menus>menu</a></code> or <code><a href=#the-select-element>select</a></code> element, then
    append another separator.</dd>
+
    <!-- v2: we might want to support <select> in <label> as giving a named submenu -->
 
 
@@ -38873,20 +38874,17 @@ explain that only direct children of the <menu> matter
   is UA-dependent, as it will vary based on platform conventions.</p>
 
   <p>The default action of the <code title=event-contextmenu>contextmenu</code> event depends on
-  whether the element has a context menu assigned (using the <code title=attr-contextmenu><a href=#attr-contextmenu>contextmenu</a></code> attribute) or not. If it
-  does not, the default action must be for the user agent to show its
-  default context menu, if it has one.</p>
-
-  <p class=XXX>Context menus should inherit (so clicking on a
-  span in a paragraph with a context menu should show the menu).</p>
-
-  <p>If the element <em>does</em> have a context menu assigned, then
-  the user agent must <a href=#fire-a-simple-event>fire a simple event</a> called <code title=event-show>show</code> at the <code><a href=#menus>menu</a></code>
-  element. <span class=XXX>Actually this should fire an event that
-  has modifier information (shift/ctrl etc), as well as having a
-  pointer to the node on which the menu was fired, and with which the
-  menu was associated (which could be an ancestor of the
-  former).</span></p>
+  whether the element or one of its ancestors has a context menu
+  assigned (using the <code title=attr-contextmenu><a href=#attr-contextmenu>contextmenu</a></code> attribute) or not. If
+  there is no context menu assigned, the default action must be for
+  the user agent to show its default context menu, if it has one.</p>
+
+  <p>If the element or one of its ancestors <em>does</em> have a
+  context menu assigned, then the user agent must <a href=#fire-a-simple-event>fire a simple
+  event</a> called <code title=event-show>show</code> at the
+  <code><a href=#menus>menu</a></code> element of the context menu of the nearest
+  ancestor (including the element itself) with one assigned.</p>
+  <!-- v2: include modifier key information -->
 
   <p>The default action of <em>this</em> event is that the user agent
   must show a context menu <a href=#building-menus-and-tool-bars title="building menus and tool

diff --git a/source b/source
@@ -42637,8 +42637,8 @@ interface <dfn>RenderingContext2DCallback</dfn> {
 
   <p>The <code>DataGridListener</code> interface, once implemented by
   an object in a script and hooked up to a <code>datagrid</code> using
-  the <dfn title="dom-datagrid-listener"><code>listener</code></dfn>
-  DOM attribute, receives notifications when the <code>datagrid</code>
+  the <code title="dom-datagrid-listener">listener</code> DOM
+  attribute, receives notifications when the <code>datagrid</code>
   needs information (such as which rows exist) for display.</p>
 
   <p>The following methods may be usefully implemented:</p>
@@ -43650,22 +43650,18 @@ explain that only direct children of the <menu> matter
 
   <p>The default action of the <code
   title="event-contextmenu">contextmenu</code> event depends on
-  whether the element has a context menu assigned (using the <code
-  title="attr-contextmenu">contextmenu</code> attribute) or not. If it
-  does not, the default action must be for the user agent to show its
-  default context menu, if it has one.</p>
-
-  <p class="XXX">Context menus should inherit (so clicking on a
-  span in a paragraph with a context menu should show the menu).</p>
-
-  <p>If the element <em>does</em> have a context menu assigned, then
-  the user agent must <span>fire a simple event</span> called <code
-  title="event-show">show</code> at the <code>menu</code>
-  element. <span class="XXX">Actually this should fire an event that
-  has modifier information (shift/ctrl etc), as well as having a
-  pointer to the node on which the menu was fired, and with which the
-  menu was associated (which could be an ancestor of the
-  former).</span></p>
+  whether the element or one of its ancestors has a context menu
+  assigned (using the <code
+  title="attr-contextmenu">contextmenu</code> attribute) or not. If
+  there is no context menu assigned, the default action must be for
+  the user agent to show its default context menu, if it has one.</p>
+
+  <p>If the element or one of its ancestors <em>does</em> have a
+  context menu assigned, then the user agent must <span>fire a simple
+  event</span> called <code title="event-show">show</code> at the
+  <code>menu</code> element of the context menu of the nearest
+  ancestor (including the element itself) with one assigned.</p>
+  <!-- v2: include modifier key information -->
 
   <p>The default action of <em>this</em> event is that the user agent
   must show a context menu <span title="building menus and tool