[giow] (2) Fix <option> to match reality better.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=12602 git-svn-id: http://svn.whatwg.org/webapps@6351 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 2, 2011 · 463ed0c · 463ed0c
1 parent d429d74
commit 463ed0c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/complete.html b/complete.html
@@ -48764,13 +48764,13 @@ <h4 id=the-option-element><span class=secno>4.10.12 </span>The <dfn><code>option
 
   <p>The <dfn id=attr-option-label title=attr-option-label><code>label</code></dfn>
   attribute provides a label for element. The <dfn id=concept-option-label title=concept-option-label>label</dfn> of an <code><a href=#the-option-element>option</a></code>
-  element is the value of the <code title=attr-option-label><a href=#attr-option-label>label</a></code> attribute, if there is one,
-  or the <code><a href=#textcontent>textContent</a></code> of the element, if there isn't.</p>
+  element is the value of the <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if there
+  is one, or, if there is not, the value of the element's <code title=dom-option-text><a href=#dom-option-text>text</a></code> IDL attribute.</p>
 
   <p>The <dfn id=attr-option-value title=attr-option-value><code>value</code></dfn>
   attribute provides a value for element. The <dfn id=concept-option-value title=concept-option-value>value</dfn> of an <code><a href=#the-option-element>option</a></code>
-  element is the value of the <code title=attr-option-value><a href=#attr-option-value>value</a></code> attribute, if there is one,
-  or the <code><a href=#textcontent>textContent</a></code> of the element, if there isn't.</p>
+  element is the value of the <code title=attr-option-value><a href=#attr-option-value>value</a></code> content attribute, if there
+  is one, or, if there is not, the value of the element's <code title=dom-option-text><a href=#dom-option-text>text</a></code> IDL attribute.</p>
 
   <p>The <dfn id=attr-option-selected title=attr-option-selected><code>selected</code></dfn>
   attribute is a <a href=#boolean-attribute>boolean attribute</a>. It represents the
@@ -48890,11 +48890,10 @@ <h4 id=the-option-element><span class=secno>4.10.12 </span>The <dfn><code>option
 
   <p>The <dfn id=dom-option-text title=dom-option-text><code>text</code></dfn> IDL
   attribute, on getting, must return the value of the
-  <code><a href=#textcontent>textContent</a></code> IDL attribute on the element with leading
-  and trailing <a href=#space-character title="space character">space characters</a>
-  removed, and with any sequences of two or more <a href=#space-character title="space
-  character">space characters</a> replaced by a single U+0020 SPACE
-  character. On setting, it must act as if the
+  <code><a href=#textcontent>textContent</a></code> IDL attribute on the element, with <a href=#strip-leading-and-trailing-whitespace title="strip leading and trailing whitespace">leading and trailing
+  whitespace stripped</a>, and with any sequences of two or more
+  <a href=#space-character title="space character">space characters</a> replaced by a
+  single U+0020 SPACE character. On setting, it must act as if the
   <code><a href=#textcontent>textContent</a></code> IDL attribute on the element had been set
   to the new value.</p>
 

diff --git a/index b/index
@@ -48636,13 +48636,13 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
 
   <p>The <dfn id=attr-option-label title=attr-option-label><code>label</code></dfn>
   attribute provides a label for element. The <dfn id=concept-option-label title=concept-option-label>label</dfn> of an <code><a href=#the-option-element>option</a></code>
-  element is the value of the <code title=attr-option-label><a href=#attr-option-label>label</a></code> attribute, if there is one,
-  or the <code><a href=#textcontent>textContent</a></code> of the element, if there isn't.</p>
+  element is the value of the <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if there
+  is one, or, if there is not, the value of the element's <code title=dom-option-text><a href=#dom-option-text>text</a></code> IDL attribute.</p>
 
   <p>The <dfn id=attr-option-value title=attr-option-value><code>value</code></dfn>
   attribute provides a value for element. The <dfn id=concept-option-value title=concept-option-value>value</dfn> of an <code><a href=#the-option-element>option</a></code>
-  element is the value of the <code title=attr-option-value><a href=#attr-option-value>value</a></code> attribute, if there is one,
-  or the <code><a href=#textcontent>textContent</a></code> of the element, if there isn't.</p>
+  element is the value of the <code title=attr-option-value><a href=#attr-option-value>value</a></code> content attribute, if there
+  is one, or, if there is not, the value of the element's <code title=dom-option-text><a href=#dom-option-text>text</a></code> IDL attribute.</p>
 
   <p>The <dfn id=attr-option-selected title=attr-option-selected><code>selected</code></dfn>
   attribute is a <a href=#boolean-attribute>boolean attribute</a>. It represents the
@@ -48762,11 +48762,10 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
 
   <p>The <dfn id=dom-option-text title=dom-option-text><code>text</code></dfn> IDL
   attribute, on getting, must return the value of the
-  <code><a href=#textcontent>textContent</a></code> IDL attribute on the element with leading
-  and trailing <a href=#space-character title="space character">space characters</a>
-  removed, and with any sequences of two or more <a href=#space-character title="space
-  character">space characters</a> replaced by a single U+0020 SPACE
-  character. On setting, it must act as if the
+  <code><a href=#textcontent>textContent</a></code> IDL attribute on the element, with <a href=#strip-leading-and-trailing-whitespace title="strip leading and trailing whitespace">leading and trailing
+  whitespace stripped</a>, and with any sequences of two or more
+  <a href=#space-character title="space character">space characters</a> replaced by a
+  single U+0020 SPACE character. On setting, it must act as if the
   <code><a href=#textcontent>textContent</a></code> IDL attribute on the element had been set
   to the new value.</p>
 

diff --git a/source b/source
@@ -54629,15 +54629,17 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
   attribute provides a label for element. The <dfn
   title="concept-option-label">label</dfn> of an <code>option</code>
   element is the value of the <code
-  title="attr-option-label">label</code> attribute, if there is one,
-  or the <code>textContent</code> of the element, if there isn't.</p>
+  title="attr-option-label">label</code> content attribute, if there
+  is one, or, if there is not, the value of the element's <code
+  title="dom-option-text">text</code> IDL attribute.</p>
 
   <p>The <dfn title="attr-option-value"><code>value</code></dfn>
   attribute provides a value for element. The <dfn
   title="concept-option-value">value</dfn> of an <code>option</code>
   element is the value of the <code
-  title="attr-option-value">value</code> attribute, if there is one,
-  or the <code>textContent</code> of the element, if there isn't.</p>
+  title="attr-option-value">value</code> content attribute, if there
+  is one, or, if there is not, the value of the element's <code
+  title="dom-option-text">text</code> IDL attribute.</p>
 
   <p>The <dfn title="attr-option-selected"><code>selected</code></dfn>
   attribute is a <span>boolean attribute</span>. It represents the
@@ -54779,11 +54781,11 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
 
   <p>The <dfn title="dom-option-text"><code>text</code></dfn> IDL
   attribute, on getting, must return the value of the
-  <code>textContent</code> IDL attribute on the element with leading
-  and trailing <span title="space character">space characters</span>
-  removed, and with any sequences of two or more <span title="space
-  character">space characters</span> replaced by a single U+0020 SPACE
-  character. On setting, it must act as if the
+  <code>textContent</code> IDL attribute on the element, with <span
+  title="strip leading and trailing whitespace">leading and trailing
+  whitespace stripped</span>, and with any sequences of two or more
+  <span title="space character">space characters</span> replaced by a
+  single U+0020 SPACE character. On setting, it must act as if the
   <code>textContent</code> IDL attribute on the element had been set
   to the new value.</p>