[html5] r833 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2007-05-21 19:11:11 -0700 (Mon, 21 May 2007)
New Revision: 833

Modified:
   index
   source
Log:
[] (0) Fix innerHTML for XML

Modified: index
===================================================================
--- index	2007-05-22 01:59:07 UTC (rev 832)
+++ index	2007-05-22 02:11:11 UTC (rev 833)
@@ -3907,17 +3907,12 @@
    obtain namespace-well-formed XML). <a href="#refsXML">[XML]</a> <a
    href="#refsXMLNS">[XMLNS]</a>
 
-  <p>On setting, if the node is a document, the <code
-   title=dom-innerHTML-HTML><a href="#innerhtml0">innerHTML</a></code> DOM
-   attribute on must run the following algorithm:
+  <p>On setting, in an XML context, the <code title=dom-innerHTML-HTML><a
+   href="#innerhtml0">innerHTML</a></code> DOM attribute on must run the
+   following algorithm:
 
   <ol>
    <li>
-    <p>The user agent must remove the children nodes of the
-     <code>Document</code> whose <code title=dom-innerHTML-XML><a
-     href="#innerhtml2">innerHTML</a></code> attribute is being set.</p>
-
-   <li>
     <p>The user agent must create a new <span>XML parser</span>.</p>
 
    <li>
@@ -3945,8 +3940,13 @@
      must raise a <code>SYNTAX_ERR</code> exception and abort these steps.</p>
 
    <li>
-    <p>Otherwise, the user agent must take the children of the document, if
-     the attribute is being set on a <code>Document</code> node, or of the
+    <p>The user agent must remove the children nodes of the node whose <code
+     title=dom-innerHTML-XML><a href="#innerhtml2">innerHTML</a></code>
+     attribute is being set.</p>
+
+   <li>
+    <p>The user agent must take the children of the document, if the
+     attribute is being set on a <code>Document</code> node, or of the
      document's root element, if the attribute is being set on an
      <code>Element</code> node, and append them to the node whose <code
      title=dom-innerHTML-HTML><a href="#innerhtml0">innerHTML</a></code>

Modified: source
===================================================================
--- source	2007-05-22 01:59:07 UTC (rev 832)
+++ source	2007-05-22 02:11:11 UTC (rev 833)
@@ -2545,23 +2545,14 @@
   cases to obtain namespace-well-formed XML). <a
   href="#refsXML">[XML]</a> <a href="#refsXMLNS">[XMLNS]</a></p>
 
-  <p>On setting, if the node is a document, the <code
-  title="dom-innerHTML-HTML">innerHTML</code> DOM attribute on must run
-  the following algorithm:</p>
+  <p>On setting, in an XML context, the <code
+  title="dom-innerHTML-HTML">innerHTML</code> DOM attribute on must
+  run the following algorithm:</p>
 
   <ol>
 
    <li>
 
-    <p>The user agent must remove the children nodes of the
-    <code>Document</code> whose <code
-    title="dom-innerHTML-XML">innerHTML</code> attribute is being
-    set.</p>
-
-   </li>
-
-   <li>
-
     <p>The user agent must create a new <span>XML parser</span>.</p>
 
    </li>
@@ -2605,15 +2596,23 @@
 
    <li>
 
-    <p>Otherwise, the user agent must take the children of the
-    document, if the attribute is being set on a <code>Document</code>
-    node, or of the document's root element, if the attribute is being
-    set on an <code>Element</code> node, and append them to the node
-    whose <code title="dom-innerHTML-HTML">innerHTML</code> attribute
-    is being set, preserving their order.</p>
+    <p>The user agent must remove the children nodes of the node whose
+    <code title="dom-innerHTML-XML">innerHTML</code> attribute is
+    being set.</p>
 
    </li>
 
+   <li>
+
+    <p>The user agent must take the children of the document, if the
+    attribute is being set on a <code>Document</code> node, or of the
+    document's root element, if the attribute is being set on an
+    <code>Element</code> node, and append them to the node whose <code
+    title="dom-innerHTML-HTML">innerHTML</code> attribute is being
+    set, preserving their order.</p>
+
+   </li>
+
   </ol>