[giow] (0) Fix the way 'inert' is defined wrt focusability to actuall…

…y work. (Why was it defined the other way before? Am I missing something?) Affected topics: HTML git-svn-id: http://svn.whatwg.org/webapps@7217 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jul 27, 2012 · 7dfb664 · 7dfb664
1 parent 5fcb1dc
commit 7dfb664
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 34 deletions.
diff --git a/complete.html b/complete.html
@@ -11145,9 +11145,7 @@ <h4 id=global-attributes><span class=secno>3.2.3 </span><dfn>Global attributes</
    <li><code title=attr-dropzone><a href=#the-dropzone-attribute>dropzone</a></code></li>
    <li><code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code></li>
    <li><code title=attr-id><a href=#the-id-attribute>id</a></code></li>
-<!--INERT-->
    <li><code title=attr-inert><a href=#the-inert-attribute>inert</a></code></li>
-<!--INERT-->
 <!--MD--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
    <li><code title=attr-itemid><a href=#attr-itemid>itemid</a></code></li>
    <li><code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code></li>
@@ -54576,6 +54574,11 @@ <h5 id=autofocusing-a-form-control:-the-autofocus-attribute><span class=secno>4.
 
   <!-- v2: Apply this to contentEditable elements -->
 
+  <!-- v2: Make this work with modal <dialog>s:
+            - exclude <dialog> subtrees from the exclusion of multiple autofocus attributes (careful, consider nested dialogs)
+            - when a showModal() method is invoked, look for elements to autofocus in that dialog
+    -->
+
   <p>The <dfn id=attr-fe-autofocus title=attr-fe-autofocus><code>autofocus</code></dfn>
   content attribute allows the author to indicate that a control is to
   be focused as soon as the page is loaded, allowing the user to just
@@ -76008,8 +76011,8 @@ <h3 id=inert-subtrees><span class=secno>8.2 </span>Inert subtrees</h3>
   <code><a href=#the-body-element>body</a></code> element rather than the paragraph.</p>
 
   <p class=note>When a node or one of its ancestors is inert, it
-  also can't be focused (see the <a href=#focusing-steps>focusing steps</a>), and it
-  is disabled if it is a <a href=#concept-command title=concept-command>command</a>.</p>
+  also can't be <a href=#focusable>focusable</a>, and it is disabled if it is a
+  <a href=#concept-command title=concept-command>command</a>.</p>
 
   <p>An entire <code><a href=#document>Document</a></code> can be marked as <dfn id=blocked-by-a-modal-dialog>blocked by
   a modal dialog</dfn> <var title="">dialog</var>. While a
@@ -76030,7 +76033,6 @@ <h3 id=inert-subtrees><span class=secno>8.2 </span>Inert subtrees</h3>
   this mechanism.</p>
 
 
-<!--INERT-->
   <h4 id=the-inert-attribute><span class=secno>8.2.1 </span>The <dfn title=attr-inert><code>inert</code></dfn> attribute</h4>
 
   <p>The <code title=attr-inert><a href=#the-inert-attribute>inert</a></code> attribute is a
@@ -76055,7 +76057,6 @@ <h4 id=the-inert-attribute><span class=secno>8.2.1 </span>The <dfn title=attr-in
   the active part of a page and may get frustrated if inert sections
   are not obviously inert. For individual controls, the <code title=attr-input-disabled>disabled</code> attribute is probably
   more appropriate.</p>
-<!--INERT-->
 
 
 <!--TOPIC:DOM APIs-->
@@ -76273,7 +76274,9 @@ <h4 id=focus-management><span class=secno>8.4.2 </span>Focus management</h4>
   <a href=#specially-focusable>tabindex focus flag</a> set, but only if the element is
   either <a href=#being-rendered>being rendered</a> or <!-- CANVAS-FOCUS-FALLBACK -->
   is a descendant of a <code><a href=#the-canvas-element>canvas</a></code> element that
-  <a href=#represents>represents</a> <a href=#embedded-content>embedded content</a>.</p>
+  <a href=#represents>represents</a> <a href=#embedded-content>embedded content</a>, and only if
+  neither the element nor any of its ancestors are
+  <a href=#inert>inert</a>.</p>
 
   <p>User agents should make the following elements
   <a href=#focusable>focusable</a> as part of their default behavior, unless
@@ -76324,8 +76327,7 @@ <h4 id=focus-management><span class=secno>8.4.2 </span>Focus management</h4>
    <code><a href=#document>Document</a></code> has no <a href=#browsing-context>browsing context</a>, or if
    the element's <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a>
    has no <a href=#top-level-browsing-context>top-level browsing context</a>, or if the element
-   is not <a href=#focusable>focusable</a>, or if the element or one of its
-   ancestors is <a href=#inert>inert</a>, then abort these steps.</p>
+   is not <a href=#focusable>focusable</a>, then abort these steps.</p>
 
    <li><p>If focusing the element will remove the focus from another
    element, then run the <a href=#unfocusing-steps>unfocusing steps</a> for that
@@ -101984,12 +101986,10 @@ <h3 class=no-num id=element-content-categories>Element content categories</h3>
      <td> <a href=#the-id-attribute title=attr-id>HTML elements</a>
      <td> The element's <a href=#concept-id title=concept-id>ID</a>
      <td> <a href=#attribute-text>Text</a>*
-<!--INERT-->
     <tr><th> <code title="">inert</code>
      <td> <a href=#the-inert-attribute title=attr-inert>HTML elements</a>
      <td> Whether the element is inert
      <td> <a href=#boolean-attribute>Boolean attribute</a>
-<!--INERT-->
     <tr><th> <code title="">ismap</code>
      <td> <code title=attr-img-ismap><a href=#attr-img-ismap>img</a></code>
      <td> Whether the image is a server-side image map

diff --git a/index b/index
@@ -11145,9 +11145,7 @@ interface <dfn id=htmlunknownelement>HTMLUnknownElement</dfn> : <a href=#htmlele
    <li><code title=attr-dropzone><a href=#the-dropzone-attribute>dropzone</a></code></li>
    <li><code title=attr-hidden><a href=#the-hidden-attribute>hidden</a></code></li>
    <li><code title=attr-id><a href=#the-id-attribute>id</a></code></li>
-<!--INERT-->
    <li><code title=attr-inert><a href=#the-inert-attribute>inert</a></code></li>
-<!--INERT-->
 <!--MD--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
    <li><code title=attr-itemid><a href=#attr-itemid>itemid</a></code></li>
    <li><code title=attr-itemprop><a href=#names:-the-itemprop-attribute>itemprop</a></code></li>
@@ -54576,6 +54574,11 @@ out of 233&thinsp;257&thinsp;824 bytes available&lt;/meter&gt;&lt;/p&gt;</pre>
 
   <!-- v2: Apply this to contentEditable elements -->
 
+  <!-- v2: Make this work with modal <dialog>s:
+            - exclude <dialog> subtrees from the exclusion of multiple autofocus attributes (careful, consider nested dialogs)
+            - when a showModal() method is invoked, look for elements to autofocus in that dialog
+    -->
+
   <p>The <dfn id=attr-fe-autofocus title=attr-fe-autofocus><code>autofocus</code></dfn>
   content attribute allows the author to indicate that a control is to
   be focused as soon as the page is loaded, allowing the user to just
@@ -76008,8 +76011,8 @@ interface <dfn id=navigatorstorageutils>NavigatorStorageUtils</dfn> {
   <code><a href=#the-body-element>body</a></code> element rather than the paragraph.</p>
 
   <p class=note>When a node or one of its ancestors is inert, it
-  also can't be focused (see the <a href=#focusing-steps>focusing steps</a>), and it
-  is disabled if it is a <a href=#concept-command title=concept-command>command</a>.</p>
+  also can't be <a href=#focusable>focusable</a>, and it is disabled if it is a
+  <a href=#concept-command title=concept-command>command</a>.</p>
 
   <p>An entire <code><a href=#document>Document</a></code> can be marked as <dfn id=blocked-by-a-modal-dialog>blocked by
   a modal dialog</dfn> <var title="">dialog</var>. While a
@@ -76030,7 +76033,6 @@ interface <dfn id=navigatorstorageutils>NavigatorStorageUtils</dfn> {
   this mechanism.</p>
 
 
-<!--INERT-->
   <h4 id=the-inert-attribute><span class=secno>8.2.1 </span>The <dfn title=attr-inert><code>inert</code></dfn> attribute</h4>
 
   <p>The <code title=attr-inert><a href=#the-inert-attribute>inert</a></code> attribute is a
@@ -76055,7 +76057,6 @@ interface <dfn id=navigatorstorageutils>NavigatorStorageUtils</dfn> {
   the active part of a page and may get frustrated if inert sections
   are not obviously inert. For individual controls, the <code title=attr-input-disabled>disabled</code> attribute is probably
   more appropriate.</p>
-<!--INERT-->
 
 
 <!--TOPIC:DOM APIs-->
@@ -76273,7 +76274,9 @@ interface <dfn id=navigatorstorageutils>NavigatorStorageUtils</dfn> {
   <a href=#specially-focusable>tabindex focus flag</a> set, but only if the element is
   either <a href=#being-rendered>being rendered</a> or <!-- CANVAS-FOCUS-FALLBACK -->
   is a descendant of a <code><a href=#the-canvas-element>canvas</a></code> element that
-  <a href=#represents>represents</a> <a href=#embedded-content>embedded content</a>.</p>
+  <a href=#represents>represents</a> <a href=#embedded-content>embedded content</a>, and only if
+  neither the element nor any of its ancestors are
+  <a href=#inert>inert</a>.</p>
 
   <p>User agents should make the following elements
   <a href=#focusable>focusable</a> as part of their default behavior, unless
@@ -76324,8 +76327,7 @@ interface <dfn id=navigatorstorageutils>NavigatorStorageUtils</dfn> {
    <code><a href=#document>Document</a></code> has no <a href=#browsing-context>browsing context</a>, or if
    the element's <code><a href=#document>Document</a></code>'s <a href=#browsing-context>browsing context</a>
    has no <a href=#top-level-browsing-context>top-level browsing context</a>, or if the element
-   is not <a href=#focusable>focusable</a>, or if the element or one of its
-   ancestors is <a href=#inert>inert</a>, then abort these steps.</p>
+   is not <a href=#focusable>focusable</a>, then abort these steps.</p>
 
    <li><p>If focusing the element will remove the focus from another
    element, then run the <a href=#unfocusing-steps>unfocusing steps</a> for that
@@ -101984,12 +101986,10 @@ if (s = prompt('What is your name?')) {
      <td> <a href=#the-id-attribute title=attr-id>HTML elements</a>
      <td> The element's <a href=#concept-id title=concept-id>ID</a>
      <td> <a href=#attribute-text>Text</a>*
-<!--INERT-->
     <tr><th> <code title="">inert</code>
      <td> <a href=#the-inert-attribute title=attr-inert>HTML elements</a>
      <td> Whether the element is inert
      <td> <a href=#boolean-attribute>Boolean attribute</a>
-<!--INERT-->
     <tr><th> <code title="">ismap</code>
      <td> <code title=attr-img-ismap><a href=#attr-img-ismap>img</a></code>
      <td> Whether the image is a server-side image map

diff --git a/source b/source
@@ -11520,9 +11520,7 @@ interface <dfn>HTMLUnknownElement</dfn> : <span>HTMLElement</span> { };</pre>
    <li><code title="attr-dropzone">dropzone</code></li>
    <li><code title="attr-hidden">hidden</code></li>
    <li><code title="attr-id">id</code></li>
-<!--END w3c-html--><!--INERT-->
    <li><code title="attr-inert">inert</code></li>
-<!--START w3c-html--><!--INERT-->
 <!--END w3c-html--><!--MD--><!--WARNING: ALSO DUPLICATED IN MICRODATA SECTION -->
    <li><code title="attr-itemid">itemid</code></li>
    <li><code title="attr-itemprop">itemprop</code></li>
@@ -63697,6 +63695,11 @@ out of 233&#x2009;257&#x2009;824 bytes available&lt;/meter>&lt;/p></pre>
 
   <!-- v2: Apply this to contentEditable elements -->
 
+  <!-- v2: Make this work with modal <dialog>s:
+            - exclude <dialog> subtrees from the exclusion of multiple autofocus attributes (careful, consider nested dialogs)
+            - when a showModal() method is invoked, look for elements to autofocus in that dialog
+    -->
+
   <p>The <dfn title="attr-fe-autofocus"><code>autofocus</code></dfn>
   content attribute allows the author to indicate that a control is to
   be focused as soon as the page is loaded, allowing the user to just
@@ -88956,9 +88959,8 @@ interface <dfn>NavigatorStorageUtils</dfn> {
   <code>body</code> element rather than the paragraph.</p>
 
   <p class="note">When a node or one of its ancestors is inert, it
-  also can't be focused (see the <span>focusing steps</span>), and it
-  is disabled if it is a <span
-  title="concept-command">command</span>.</p>
+  also can't be <span>focusable</span>, and it is disabled if it is a
+  <span title="concept-command">command</span>.</p>
 
   <p>An entire <code>Document</code> can be marked as <dfn>blocked by
   a modal dialog</dfn> <var title="">dialog</var>. While a
@@ -88981,7 +88983,6 @@ interface <dfn>NavigatorStorageUtils</dfn> {
   this mechanism.</p>
 
 
-<!--END w3c-html--><!--INERT-->
   <h4>The <dfn title="attr-inert"><code>inert</code></dfn> attribute</h4>
 
   <p>The <code title="attr-inert">inert</code> attribute is a
@@ -89007,7 +89008,6 @@ interface <dfn>NavigatorStorageUtils</dfn> {
   are not obviously inert. For individual controls, the <code
   title="attr-input-disabled">disabled</code> attribute is probably
   more appropriate.</p>
-<!--START w3c-html--><!--INERT-->
 
 
 <!--TOPIC:DOM APIs-->
@@ -89247,7 +89247,9 @@ interface <dfn>NavigatorStorageUtils</dfn> {
   <span>tabindex focus flag</span> set, but only if the element is
   either <span>being rendered</span> or <!-- CANVAS-FOCUS-FALLBACK -->
   is a descendant of a <code>canvas</code> element that
-  <span>represents</span> <span>embedded content</span>.</p>
+  <span>represents</span> <span>embedded content</span>, and only if
+  neither the element nor any of its ancestors are
+  <span>inert</span>.</p>
 
   <p>User agents should make the following elements
   <span>focusable</span> as part of their default behavior, unless
@@ -89313,8 +89315,7 @@ interface <dfn>NavigatorStorageUtils</dfn> {
    <code>Document</code> has no <span>browsing context</span>, or if
    the element's <code>Document</code>'s <span>browsing context</span>
    has no <span>top-level browsing context</span>, or if the element
-   is not <span>focusable</span>, or if the element or one of its
-   ancestors is <span>inert</span>, then abort these steps.</p>
+   is not <span>focusable</span>, then abort these steps.</p>
 
    <li><p>If focusing the element will remove the focus from another
    element, then run the <span>unfocusing steps</span> for that
@@ -119302,13 +119303,11 @@ if (s = prompt('What is your name?')) {
      <td> <span title="attr-id">HTML elements</span>
      <td> The element's <span title="concept-id">ID</span>
      <td> <a href="#attribute-text">Text</a>*
-<!--END w3c-html--><!--INERT-->
     <tr>
      <th> <code title="">inert</code>
      <td> <span title="attr-inert">HTML elements</span>
      <td> Whether the element is inert
      <td> <span>Boolean attribute</span>
-<!--START w3c-html--><!--INERT-->
     <tr>
      <th> <code title="">ismap</code>
      <td> <code title="attr-img-ismap">img</code>