[e] (0) Make clearer what is meant by 'system focus'.

git-svn-id: http://svn.whatwg.org/webapps@2542 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Dec 18, 2008 · 1ca81c7 · 1ca81c7
1 parent e1676d0
commit 1ca81c7
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 66 deletions.
diff --git a/index b/index
@@ -21,7 +21,7 @@
   <div class=head>
    <p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <h1>HTML 5</h1>
-   <h2 class="no-num no-toc" id=draft-recommendation-&mdash;-date:-01-jan-1901>Draft Recommendation &mdash; 17 December 2008</h2>
+   <h2 class="no-num no-toc" id=draft-recommendation-&mdash;-date:-01-jan-1901>Draft Recommendation &mdash; 18 December 2008</h2>
    <p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <dl><dt>Multiple-page version:</dt>
@@ -32929,7 +32929,7 @@ interface <dfn id=window>Window</dfn> {
           http://www.mozilla.org/docs/dom/domref/dom_window_ref.html
           http://lxr.mozilla.org/mozilla/source/dom/public/idl/base/nsIDOMWindow.idl - scrollBy, etc
           http://lxr.mozilla.org/mozilla/source/dom/public/idl/base/nsIDOMWindowInternal.idl - DOM level 0
-      close() focus() blur()
+      close() focus() blur() - when defining close(), mention it in showModalDialog() as a way to close the window
    -->
 
   <p>The <dfn id=dom-window title=dom-window><code>window</code></dfn>, <dfn id=dom-frames title=dom-frames><code>frames</code></dfn>, and <dfn id=dom-self title=dom-self><code>self</code></dfn> DOM attributes must all
@@ -40560,7 +40560,7 @@ at the first element with the given ID must be treated as if it was cloned and r
        http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/focus.asp
   -->
 
-  <p>When an element is <em>focused</em>, key events received by the
+  <p>When an element is <i>focused</i>, key events received by the
   document must be targeted at that element. There may be no element
   focused; when no element is focused, key events received by the
   document must be targetted at <a href=#the-body-element-1>the <code>body</code>
@@ -40572,10 +40572,10 @@ at the first element with the given ID must be treated as if it was cloned and r
   &mdash; user agents should follow platform conventions in this
   regard.</p>
 
-  <p>Which element(s) within a <a href=#top-level-browsing-context>top-level browsing context</a>
-  currently has focus must be independent of whether or not the
-  <a href=#top-level-browsing-context>top-level browsing context</a> itself has the <em>system
-  focus</em>.</p>
+  <p>Which elements within a <a href=#top-level-browsing-context>top-level browsing context</a>
+  currently have focus must be independent of whether or not the
+  <a href=#top-level-browsing-context>top-level browsing context</a> itself has the <i>system
+  focus</i>.</p>
 
   <p class=note>When an element is focused, the element matches the
   CSS <code>:focus</code> pseudo-class.</p>
@@ -40747,9 +40747,11 @@ at the first element with the given ID must be treated as if it was cloned and r
   must return <a href=#the-body-element-1>the <code>body</code> element</a>.</p>
 
   <p>The <dfn id=dom-document-hasfocus title=dom-document-hasFocus><code>hasFocus()</code></dfn> method
-  must return true if the document, one of its nested <a href=#browsing-context title="browsing context">browsing contexts</a>, or any element in
-  the document or its browsing contexts currently has the system
-  focus.</p>
+  must return true if the document's <a href=#browsing-context>browsing context</a> is
+  focused, and all its <a href=#ancestor-browsing-context title="ancestor browsing
+  context">ancestor browsing contexts</a> are also focused, and the
+  <a href=#top-level-browsing-context>top-level browsing context</a> has the <i>system
+  focus</i>.</p>
 
 
   <h4 id=element-level-focus-apis><span class=secno>6.5.4 </span>Element-level focus APIs</h4>
@@ -54577,29 +54579,29 @@ interface <dfn id=timeouthandler>TimeoutHandler</dfn> {
   Eira Monstad, Elliotte Harold, Eric Carlson, Eric Law, Erik
   Arvidsson, Evan Martin, Evan Prodromou, fantasai, Felix Sasaki,
   Franck 'Shift' Qu&eacute;lain, Garrett Smith, Geoffrey Garen,
-  Geoffrey Sneddon, George Lund, H&aring;kon Wium Lie, Henri Sivonen,
-  Henrik Lied, Henry Mason, Hugh Winkler, Ignacio Javier, Ivo Emanuel
-  Gon&ccedil;alves, J. King, Jacques Distler, James Graham, James
-  Justin Harrell, James M Snell, James Perrett, Jan-Klaas Kollhof,
-  Jason White, Jasper Bryant-Greene, Jeff Cutsinger, Jeff Schiller,
-  Jeff Walden, Jens Bannmann, Jens Fendler, Jeroen van der Meer, Jim
-  Jewett, Jim Meehan, Joe Clark, John Fallows, Joseph Kesselman, Jjgod
-  Jiang, Joel Spolsky, Johan Herland, John Boyer, John Bussjaeger,
-  John Harding, Johnny Stenback, Jon Gibbins, Jon Perlow, Jonathan
-  Worent, Jorgen Horstink, Josh Levenberg, Joshua Randall, Jukka
-  K. Korpela, Jules Cl&eacute;ment-Ripoche, Julian Reschke, Kai
-  Hendry, <!-- Keryx Web, = Lars Gunther --> Kornel Lesinski,
-  &#40658;&#28580;&#21083;&#24535; (KUROSAWA Takeshi), Kristof
-  Zelechovski, Lachlan Hunt, Larry Page, Lars Gunther, Laura
-  L. Carlson, Laura Wisewell, Laurens Holst, Lee Kowalkowski, Leif
-  Halvard Silli, Lenny Domnitser, L&eacute;onard Bouchet, Leons
-  Petrazickis, Logan<!-- on moz irc -->, Loune, Maciej Stachowiak,
-  Magnus Kristiansen<!-- Dashiva -->, Maik Merten, Malcolm Rowe, Mark
-  Nottingham, Mark Rowe<!--bdash-->, Mark Schenk, Martijn Wargers,
-  Martin Atkins, Martin D&uuml;rst, Martin Honnen, Masataka Yakura,
-  Mathieu Henri, Matthew Gregan, Matthew Mastracci, Matthew Raymond,
-  Matthew Thomas, Mattias Waldau, Max Romantschuk, Michael 'Ratt'
-  Iannarelli, Michael A. Nachbaur, Michael A. Puls
+  Geoffrey Sneddon, George Lund, H&aring;kon Wium Lie, Hans
+  S. T&oslash;mmerhalt, Henri Sivonen, Henrik Lied, Henry Mason, Hugh
+  Winkler, Ignacio Javier, Ivo Emanuel Gon&ccedil;alves, J. King,
+  Jacques Distler, James Graham, James Justin Harrell, James M Snell,
+  James Perrett, Jan-Klaas Kollhof, Jason White, Jasper Bryant-Greene,
+  Jeff Cutsinger, Jeff Schiller, Jeff Walden, Jens Bannmann, Jens
+  Fendler, Jeroen van der Meer, Jim Jewett, Jim Meehan, Joe Clark,
+  John Fallows, Joseph Kesselman, Jjgod Jiang, Joel Spolsky, Johan
+  Herland, John Boyer, John Bussjaeger, John Harding, Johnny Stenback,
+  Jon Gibbins, Jon Perlow, Jonathan Worent, Jorgen Horstink, Josh
+  Levenberg, Joshua Randall, Jukka K. Korpela, Jules
+  Cl&eacute;ment-Ripoche, Julian Reschke, Kai Hendry, <!-- Keryx Web,
+  = Lars Gunther --> Kornel Lesinski, &#40658;&#28580;&#21083;&#24535;
+  (KUROSAWA Takeshi), Kristof Zelechovski, Lachlan Hunt, Larry Page,
+  Lars Gunther, Laura L. Carlson, Laura Wisewell, Laurens Holst, Lee
+  Kowalkowski, Leif Halvard Silli, Lenny Domnitser, L&eacute;onard
+  Bouchet, Leons Petrazickis, Logan<!-- on moz irc -->, Loune, Maciej
+  Stachowiak, Magnus Kristiansen<!-- Dashiva -->, Maik Merten, Malcolm
+  Rowe, Mark Nottingham, Mark Rowe<!--bdash-->, Mark Schenk, Martijn
+  Wargers, Martin Atkins, Martin D&uuml;rst, Martin Honnen, Masataka
+  Yakura, Mathieu Henri, Matthew Gregan, Matthew Mastracci, Matthew
+  Raymond, Matthew Thomas, Mattias Waldau, Max Romantschuk, Michael
+  'Ratt' Iannarelli, Michael A. Nachbaur, Michael A. Puls
   II<!--Shadow2531-->, Michael Carter, Michael Gratton, Michael
   Nordman, Michael Powers, Michael(tm) Smith, Michel Fortin, Michiel
   van der Blonk, Mihai &#350;ucan<!-- from ROBO Design -->, Mike

diff --git a/source b/source
@@ -37442,7 +37442,7 @@ interface <dfn>Window</dfn> {
           http://www.mozilla.org/docs/dom/domref/dom_window_ref.html
           http://lxr.mozilla.org/mozilla/source/dom/public/idl/base/nsIDOMWindow.idl - scrollBy, etc
           http://lxr.mozilla.org/mozilla/source/dom/public/idl/base/nsIDOMWindowInternal.idl - DOM level 0
-      close() focus() blur()
+      close() focus() blur() - when defining close(), mention it in showModalDialog() as a way to close the window
    -->
 
   <p>The <dfn title="dom-window"><code>window</code></dfn>, <dfn
@@ -46235,7 +46235,7 @@ at the first element with the given ID must be treated as if it was cloned and r
        http://msdn.microsoft.com/workshop/author/dhtml/reference/methods/focus.asp
   -->
 
-  <p>When an element is <em>focused</em>, key events received by the
+  <p>When an element is <i>focused</i>, key events received by the
   document must be targeted at that element. There may be no element
   focused; when no element is focused, key events received by the
   document must be targetted at <span>the <code>body</code>
@@ -46247,10 +46247,10 @@ at the first element with the given ID must be treated as if it was cloned and r
   &mdash; user agents should follow platform conventions in this
   regard.</p>
 
-  <p>Which element(s) within a <span>top-level browsing context</span>
-  currently has focus must be independent of whether or not the
-  <span>top-level browsing context</span> itself has the <em>system
-  focus</em>.</p>
+  <p>Which elements within a <span>top-level browsing context</span>
+  currently have focus must be independent of whether or not the
+  <span>top-level browsing context</span> itself has the <i>system
+  focus</i>.</p>
 
   <p class="note">When an element is focused, the element matches the
   CSS <code>:focus</code> pseudo-class.</p>
@@ -46454,10 +46454,11 @@ at the first element with the given ID must be treated as if it was cloned and r
 
   <p>The <dfn
   title="dom-document-hasFocus"><code>hasFocus()</code></dfn> method
-  must return true if the document, one of its nested <span
-  title="browsing context">browsing contexts</span>, or any element in
-  the document or its browsing contexts currently has the system
-  focus.</p>
+  must return true if the document's <span>browsing context</span> is
+  focused, and all its <span title="ancestor browsing
+  context">ancestor browsing contexts</span> are also focused, and the
+  <span>top-level browsing context</span> has the <i>system
+  focus</i>.</p>
 
 
   <h4>Element-level focus APIs</h4>
@@ -59675,29 +59676,29 @@ interface <dfn>TimeoutHandler</dfn> {
   Eira Monstad, Elliotte Harold, Eric Carlson, Eric Law, Erik
   Arvidsson, Evan Martin, Evan Prodromou, fantasai, Felix Sasaki,
   Franck 'Shift' Qu&eacute;lain, Garrett Smith, Geoffrey Garen,
-  Geoffrey Sneddon, George Lund, H&aring;kon Wium Lie, Henri Sivonen,
-  Henrik Lied, Henry Mason, Hugh Winkler, Ignacio Javier, Ivo Emanuel
-  Gon&ccedil;alves, J. King, Jacques Distler, James Graham, James
-  Justin Harrell, James M Snell, James Perrett, Jan-Klaas Kollhof,
-  Jason White, Jasper Bryant-Greene, Jeff Cutsinger, Jeff Schiller,
-  Jeff Walden, Jens Bannmann, Jens Fendler, Jeroen van der Meer, Jim
-  Jewett, Jim Meehan, Joe Clark, John Fallows, Joseph Kesselman, Jjgod
-  Jiang, Joel Spolsky, Johan Herland, John Boyer, John Bussjaeger,
-  John Harding, Johnny Stenback, Jon Gibbins, Jon Perlow, Jonathan
-  Worent, Jorgen Horstink, Josh Levenberg, Joshua Randall, Jukka
-  K. Korpela, Jules Cl&eacute;ment-Ripoche, Julian Reschke, Kai
-  Hendry, <!-- Keryx Web, = Lars Gunther --> Kornel Lesinski,
-  &#x9ed2;&#x6fa4;&#x525b;&#x5fd7; (KUROSAWA Takeshi), Kristof
-  Zelechovski, Lachlan Hunt, Larry Page, Lars Gunther, Laura
-  L. Carlson, Laura Wisewell, Laurens Holst, Lee Kowalkowski, Leif
-  Halvard Silli, Lenny Domnitser, L&eacute;onard Bouchet, Leons
-  Petrazickis, Logan<!-- on moz irc -->, Loune, Maciej Stachowiak,
-  Magnus Kristiansen<!-- Dashiva -->, Maik Merten, Malcolm Rowe, Mark
-  Nottingham, Mark Rowe<!--bdash-->, Mark Schenk, Martijn Wargers,
-  Martin Atkins, Martin D&uuml;rst, Martin Honnen, Masataka Yakura,
-  Mathieu Henri, Matthew Gregan, Matthew Mastracci, Matthew Raymond,
-  Matthew Thomas, Mattias Waldau, Max Romantschuk, Michael 'Ratt'
-  Iannarelli, Michael A. Nachbaur, Michael A. Puls
+  Geoffrey Sneddon, George Lund, H&aring;kon Wium Lie, Hans
+  S. T&oslash;mmerhalt, Henri Sivonen, Henrik Lied, Henry Mason, Hugh
+  Winkler, Ignacio Javier, Ivo Emanuel Gon&ccedil;alves, J. King,
+  Jacques Distler, James Graham, James Justin Harrell, James M Snell,
+  James Perrett, Jan-Klaas Kollhof, Jason White, Jasper Bryant-Greene,
+  Jeff Cutsinger, Jeff Schiller, Jeff Walden, Jens Bannmann, Jens
+  Fendler, Jeroen van der Meer, Jim Jewett, Jim Meehan, Joe Clark,
+  John Fallows, Joseph Kesselman, Jjgod Jiang, Joel Spolsky, Johan
+  Herland, John Boyer, John Bussjaeger, John Harding, Johnny Stenback,
+  Jon Gibbins, Jon Perlow, Jonathan Worent, Jorgen Horstink, Josh
+  Levenberg, Joshua Randall, Jukka K. Korpela, Jules
+  Cl&eacute;ment-Ripoche, Julian Reschke, Kai Hendry, <!-- Keryx Web,
+  = Lars Gunther --> Kornel Lesinski, &#x9ed2;&#x6fa4;&#x525b;&#x5fd7;
+  (KUROSAWA Takeshi), Kristof Zelechovski, Lachlan Hunt, Larry Page,
+  Lars Gunther, Laura L. Carlson, Laura Wisewell, Laurens Holst, Lee
+  Kowalkowski, Leif Halvard Silli, Lenny Domnitser, L&eacute;onard
+  Bouchet, Leons Petrazickis, Logan<!-- on moz irc -->, Loune, Maciej
+  Stachowiak, Magnus Kristiansen<!-- Dashiva -->, Maik Merten, Malcolm
+  Rowe, Mark Nottingham, Mark Rowe<!--bdash-->, Mark Schenk, Martijn
+  Wargers, Martin Atkins, Martin D&uuml;rst, Martin Honnen, Masataka
+  Yakura, Mathieu Henri, Matthew Gregan, Matthew Mastracci, Matthew
+  Raymond, Matthew Thomas, Mattias Waldau, Max Romantschuk, Michael
+  'Ratt' Iannarelli, Michael A. Nachbaur, Michael A. Puls
   II<!--Shadow2531-->, Michael Carter, Michael Gratton, Michael
   Nordman, Michael Powers, Michael(tm) Smith, Michel Fortin, Michiel
   van der Blonk, Mihai &#x015E;ucan<!-- from ROBO Design -->, Mike