[giowt] (0) Microdata: Fix the algorithm that removes duplicates to h…

…andle itemref=''. Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=8242 git-svn-id: http://svn.whatwg.org/webapps@4473 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jan 5, 2010 · fde3076 · fde3076
1 parent a07f357
commit fde3076
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/complete.html b/complete.html
@@ -45094,8 +45094,8 @@ <h4 id=associating-names-with-items><span class=secno>5.2.5 </span>Associating n
 
     <p>For each element <var title="">candidate</var> in <var title="">pending</var>, run the following substeps:</p>
 
-    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified.</li>
+    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, if
+     any, or null otherwise.</li>
 
      <li><p>If one of the other elements in <var title="">pending</var>
      is also <var title="">candidate</var>, then remove <var title="">candidate</var> from <var title="">pending</var>
@@ -45104,9 +45104,10 @@ <h4 id=associating-names-with-items><span class=secno>5.2.5 </span>Associating n
      <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element is <var title="">scope</var>, then remove <var title="">candidate</var>
      from <var title="">pending</var>.</li>
 
-     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element also has <var title="">scope</var> as its nearest ancestor element with an
-     <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified, then remove <var title="">candidate</var> from <var title="">pending</var>.</li>
+     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and either <var title="">scope</var> is
+     null or that element also has <var title="">scope</var> as its
+     nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, then
+     remove <var title="">candidate</var> from <var title="">pending</var>.</li>
 
     </ol></li>
 

diff --git a/index b/index
@@ -44929,8 +44929,8 @@ document.body.appendChild(outer);</pre>
 
     <p>For each element <var title="">candidate</var> in <var title="">pending</var>, run the following substeps:</p>
 
-    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified.</li>
+    <ol><li><p>Let <var title="">scope</var> be <var title="">candidate</var>'s nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, if
+     any, or null otherwise.</li>
 
      <li><p>If one of the other elements in <var title="">pending</var>
      is also <var title="">candidate</var>, then remove <var title="">candidate</var> from <var title="">pending</var>
@@ -44939,9 +44939,10 @@ document.body.appendChild(outer);</pre>
      <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element is <var title="">scope</var>, then remove <var title="">candidate</var>
      from <var title="">pending</var>.</li>
 
-     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and that element also has <var title="">scope</var> as its nearest ancestor element with an
-     <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute
-     specified, then remove <var title="">candidate</var> from <var title="">pending</var>.</li>
+     <li><p>Otherwise, if one of the other elements in <var title="">pending</var> is an ancestor element of <var title="">candidate</var>, and either <var title="">scope</var> is
+     null or that element also has <var title="">scope</var> as its
+     nearest ancestor element with an <code title=attr-itemscope><a href=#attr-itemscope>itemscope</a></code> attribute specified, then
+     remove <var title="">candidate</var> from <var title="">pending</var>.</li>
 
     </ol></li>
 

diff --git a/source b/source
@@ -50180,8 +50180,8 @@ document.body.appendChild(outer);</pre>
 
      <li><p>Let <var title="">scope</var> be <var
      title="">candidate</var>'s nearest ancestor element with an <code
-     title="attr-itemscope">itemscope</code> attribute
-     specified.</p></li>
+     title="attr-itemscope">itemscope</code> attribute specified, if
+     any, or null otherwise.</p></li>
 
      <li><p>If one of the other elements in <var title="">pending</var>
      is also <var title="">candidate</var>, then remove <var
@@ -50196,10 +50196,11 @@ document.body.appendChild(outer);</pre>
 
      <li><p>Otherwise, if one of the other elements in <var
      title="">pending</var> is an ancestor element of <var
-     title="">candidate</var>, and that element also has <var
-     title="">scope</var> as its nearest ancestor element with an
-     <code title="attr-itemscope">itemscope</code> attribute
-     specified, then remove <var title="">candidate</var> from <var
+     title="">candidate</var>, and either <var title="">scope</var> is
+     null or that element also has <var title="">scope</var> as its
+     nearest ancestor element with an <code
+     title="attr-itemscope">itemscope</code> attribute specified, then
+     remove <var title="">candidate</var> from <var
      title="">pending</var>.</p></li>
 
     </ol>