From 2a10df50bcfec6908fcafe68d0c31048c5543583 Mon Sep 17 00:00:00 2001
From: Patricia Aas <psmaas@gmail.com>
Date: Tue, 17 Apr 2018 16:49:34 +0200
Subject: [PATCH] Focus the dialog instead of the first item (#1331)

fix #773
* Fixed Dialog Focus according to issue 773
* marked as potentially at risk
---
 includes/status.include                         |  3 ++-
 sections/acknowledgements.include               | 13 +++++++++++++
 sections/changes.include                        |  5 +++++
 sections/semantics-interactive-elements.include |  5 +----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/includes/status.include b/includes/status.include
index 80468cd89e..3544302821 100644
--- a/includes/status.include
+++ b/includes/status.include
@@ -10,7 +10,8 @@ will be not be included in a Proposed Recommendation,
 per [W3C Process - 6.4 Candidate Recommendation](https://www.w3.org/2017/Process-20170301/#candidate-rec):</p>
 
 <ul>
- <li>the <{input/autocapitalize}> attribute;</li>
+ <li>the <{autocapitalize}> attribute;</li>
+ <li>focusing the dialog instead of the first focusable element if there are no autofocus elements, see issue 773</li>
  <li>the <{media/disableRemotePlayback}> attribute;</li>
  <li>{{registerContentHandler()}}, {{unregisterContentHandler()}} and {{isContentHandlerRegistered()}} methods;</li>
  <li><a>customized built-in elements</a> and the <{global/is}> attribute</li>
diff --git a/sections/acknowledgements.include b/sections/acknowledgements.include
index c0f4979fc7..2fd5474d64 100644
--- a/sections/acknowledgements.include
+++ b/sections/acknowledgements.include
@@ -39,9 +39,11 @@
   "adugamayuba", <!-- on github -->
   Ajay Data,
   Alex Danilo,
+  Alexander Surkov,
   Alex Komoroske,
   Alex Russell,
   Alexandre Borela,
+  Alastair Campbell,
   Amelia Bellamy-Royds,
   Andrea Rendine,
   Andres Rios,
@@ -55,12 +57,15 @@
   Chris Harvey,
   Chris Rebert,
   Collin Anderson,
+  Dan Beam,
   Daniel Buchner,
   David Hyatt,
   David Singer,
+  Darryl Pogue,
   "Decaid", <!-- on github -->
   Derek Gray,
   Devarshi Pant,
+  Dominic Mazzoni,
   Diego Ferreiro Val,
   Dimitri Glazkov,
   Dominic Cooney,
@@ -70,9 +75,12 @@
   Eric Bailey,
   Erik Arvidsson,
   Fabian Pijcke,
+  freshp86, <!-- on github -->
   Hajime Morrita,
   Hayato Ito,
+  Heydon Pickering,
   J.C.Jones,
+  James Craig,
   Jan Miksovsky,
   Jimmy Bosse,
   "Jinjiang 勾三股四", <!-- github -->
@@ -85,14 +93,17 @@
   Jonathan T Neal,
   Jothan Frake,
   Justin Falgani,
+  田村健人 (TAMURA Kent),
   Koji Ishii,
   Leif Halvard Silli,
   Léonie Watson,
   Lea Verou,
   Maciej Stachowiak,
+  Marco Zehe,
   Mark Svancarek,
   Martin Janecke,
   Marvin Woo 吴秀诚,
+  Matt Falkenhagen,
   Mike™ Smith,
   Mike West,
   "Miketubby", <!-- github -->
@@ -120,6 +131,7 @@
   Ronald Eddy jr.,
   Ryosuke Niwa,
   Sailesh Panchang,
+  Sam Thorogood,
   Scott Miles,
   "SelenIT", <!-- github -->
   Shawn Steele,
@@ -128,6 +140,7 @@
   Steven Faulkner,
   Steven Skelton,
   Tab Atkins,
+  Takayoshi Kochi,
   Theresa O'Connor,
   Tim Perry,
   Todor Todorov,
diff --git a/sections/changes.include b/sections/changes.include
index abf62d0f14..b7c5f3d6d6 100644
--- a/sections/changes.include
+++ b/sections/changes.include
@@ -30,6 +30,11 @@
       Fixed <a href="https://github.com/w3c/html/issues/1217">issue 1217</a>
     </dd>
     <dt>
+      <a href="https://github.com/w3c/html/pull/1331">Focusing the dialog instead of the first focusable element if there are no autofocus elements</a>
+    </dt>
+    <dd>
+      Substantive change. Fixes <a href="https://github.com/w3c/html/issues/773">issue 773</a>. Potentially at risk.
+    </dt>
       <a href="https://github.com/w3c/html/pull/1332">Clarify that the DOCTYPE is ignored, if present, for srcdoc</a>
     </dt>
     <dd>
diff --git a/sections/semantics-interactive-elements.include b/sections/semantics-interactive-elements.include
index 9a7d29c7d5..60620025b5 100644
--- a/sections/semantics-interactive-elements.include
+++ b/sections/semantics-interactive-elements.include
@@ -663,10 +663,7 @@
     Let <var>control</var> be the first non-<a>inert</a> <a>focusable area</a> in
     <var>subject</var>'s <a>control group</a> whose <a>DOM anchor</a> has an <{formelements/autofocus}> attribute specified.
 
-    If there isn't one, then let <var>control</var> be the first non-<a>inert</a>
-    <a>focusable area</a> in <var>subject</var>'s <a>control group</a>.
-
-    If there isn't one of those either, then let <var>control</var> be <var>subject</var>.
+    If there isn't one, then let <var>control</var> be <var>subject</var>.
 
     </li>