[e] (0) Update how WindowModal gets merged in using new text from hey…

…cam. git-svn-id: http://svn.whatwg.org/webapps@5885 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Feb 14, 2011 · 1d3d718 · 1d3d718
1 parent 909891b
commit 1d3d718
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/complete.html b/complete.html
@@ -66159,12 +66159,17 @@ <h4 id=dialogs-implemented-using-separate-documents><span class=secno>7.4.3 </sp
 
   </ol><p>The <code><a href=#window>Window</a></code> objects of <code><a href=#document>Document</a></code>s hosted
   by <a href=#browsing-context title="browsing context">browsing contexts</a> created
-  by the above algorithm must all have the <code><a href=#windowmodal>WindowModal</a></code>
-  interface added to their <code><a href=#window>Window</a></code> interface:</p>
+  by the above algorithm must also implement the
+  <code><a href=#windowmodal>WindowModal</a></code> interface.</p>
+
+  <p class=note>When this happens, the members of the
+  <code><a href=#windowmodal>WindowModal</a></code> interface, in JavaScript environments,
+  appear to actually be part of the <code><a href=#window>Window</a></code> interface
+  (e.g. they are on the same prototype chain as the <code title=dom-alert><a href=#dom-alert>window.alert()</a></code> method).</p>
 
   </div>
 
-  <pre class=idl>[Supplemental, NoInterfaceObject] interface <dfn id=windowmodal>WindowModal</dfn> {
+  <pre class=idl>[NoInterfaceObject] interface <dfn id=windowmodal>WindowModal</dfn> {
   readonly attribute any <a href=#dom-windowmodal-dialogarguments title=dom-WindowModal-dialogArguments>dialogArguments</a>;
            attribute DOMString <a href=#dom-windowmodal-returnvalue title=dom-WindowModal-returnValue>returnValue</a>;
 };</pre>

diff --git a/index b/index
@@ -66162,12 +66162,17 @@ interface <dfn id=windowtimers>WindowTimers</dfn> {
 
   </ol><p>The <code><a href=#window>Window</a></code> objects of <code><a href=#document>Document</a></code>s hosted
   by <a href=#browsing-context title="browsing context">browsing contexts</a> created
-  by the above algorithm must all have the <code><a href=#windowmodal>WindowModal</a></code>
-  interface added to their <code><a href=#window>Window</a></code> interface:</p>
+  by the above algorithm must also implement the
+  <code><a href=#windowmodal>WindowModal</a></code> interface.</p>
+
+  <p class=note>When this happens, the members of the
+  <code><a href=#windowmodal>WindowModal</a></code> interface, in JavaScript environments,
+  appear to actually be part of the <code><a href=#window>Window</a></code> interface
+  (e.g. they are on the same prototype chain as the <code title=dom-alert><a href=#dom-alert>window.alert()</a></code> method).</p>
 
   </div>
 
-  <pre class=idl>[Supplemental, NoInterfaceObject] interface <dfn id=windowmodal>WindowModal</dfn> {
+  <pre class=idl>[NoInterfaceObject] interface <dfn id=windowmodal>WindowModal</dfn> {
   readonly attribute any <a href=#dom-windowmodal-dialogarguments title=dom-WindowModal-dialogArguments>dialogArguments</a>;
            attribute DOMString <a href=#dom-windowmodal-returnvalue title=dom-WindowModal-returnValue>returnValue</a>;
 };</pre>

diff --git a/source b/source
@@ -75338,12 +75338,18 @@ interface <dfn>WindowTimers</dfn> {
 
   <p>The <code>Window</code> objects of <code>Document</code>s hosted
   by <span title="browsing context">browsing contexts</span> created
-  by the above algorithm must all have the <code>WindowModal</code>
-  interface added to their <code>Window</code> interface:</p>
+  by the above algorithm must also implement the
+  <code>WindowModal</code> interface.</p>
+
+  <p class="note">When this happens, the members of the
+  <code>WindowModal</code> interface, in JavaScript environments,
+  appear to actually be part of the <code>Window</code> interface
+  (e.g. they are on the same prototype chain as the <code
+  title="dom-alert">window.alert()</code> method).</p>
 
   </div>
 
-  <pre class="idl">[Supplemental, NoInterfaceObject] interface <dfn>WindowModal</dfn> {
+  <pre class="idl">[NoInterfaceObject] interface <dfn>WindowModal</dfn> {
   readonly attribute any <span title="dom-WindowModal-dialogArguments">dialogArguments</span>;
            attribute DOMString <span title="dom-WindowModal-returnValue">returnValue</span>;
 };</pre>