[giow] (2) Make option.label and option.value more consistent.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=12255 git-svn-id: http://svn.whatwg.org/webapps@6560 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Sep 22, 2011 · fbbf46b · fbbf46b
1 parent e6b6055
commit fbbf46b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/complete.html b/complete.html
@@ -239,7 +239,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1>Web Applications 1.0</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 21 September 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 22 September 2011</h2>
    </hgroup><dl><dt>Multiple-page version:</dt>
     <dd><a href=http://www.whatwg.org/specs/web-apps/current-work/complete/>http://www.whatwg.org/specs/web-apps/current-work/complete/</a></dd>
     <dt>One-page version:</dt>
@@ -49332,11 +49332,16 @@ <h4 id=the-option-element><span class=secno>4.10.12 </span>The <dfn><code>option
   </dl><div class=impl>
 
   <p>The <dfn id=dom-option-disabled title=dom-option-disabled><code>disabled</code></dfn>
-  and <dfn id=dom-option-label title=dom-option-label><code>label</code></dfn> IDL
-  attributes must <a href=#reflect>reflect</a> the respective content
-  attributes of the same name. The <dfn id=dom-option-defaultselected title=dom-option-defaultSelected><code>defaultSelected</code></dfn>
+  IDL attribute must <a href=#reflect>reflect</a> the content attribute of the
+  same name. The <dfn id=dom-option-defaultselected title=dom-option-defaultSelected><code>defaultSelected</code></dfn>
   IDL attribute must <a href=#reflect>reflect</a> the <code title=attr-option-selected><a href=#attr-option-selected>selected</a></code> content attribute.</p>
 
+  <p>The <dfn id=dom-option-label title=dom-option-label><code>label</code></dfn> IDL
+  attribute, on getting, must return the value of the element's <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if it has
+  one, or else the value of the element's <code><a href=#textcontent>textContent</a></code> IDL
+  attribute. On setting, the element's <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute must be set
+  to the new value.</p>
+
   <p>The <dfn id=dom-option-value title=dom-option-value><code>value</code></dfn> IDL
   attribute, on getting, must return the value of the element's <code title=attr-option-value><a href=#attr-option-value>value</a></code> content attribute, if it has
   one, or else the value of the element's <code><a href=#textcontent>textContent</a></code> IDL

diff --git a/index b/index
@@ -243,7 +243,7 @@
 
   <header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
    <hgroup><h1 class=allcaps>HTML</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 21 September 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 22 September 2011</h2>
    </hgroup><dl><dt><strong>Web developer edition</strong></dt>
     <dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
     <dt>Multiple-page version:</dt>
@@ -49199,11 +49199,16 @@ interface <dfn id=htmloptionelement>HTMLOptionElement</dfn> : <a href=#htmleleme
   </dl><div class=impl>
 
   <p>The <dfn id=dom-option-disabled title=dom-option-disabled><code>disabled</code></dfn>
-  and <dfn id=dom-option-label title=dom-option-label><code>label</code></dfn> IDL
-  attributes must <a href=#reflect>reflect</a> the respective content
-  attributes of the same name. The <dfn id=dom-option-defaultselected title=dom-option-defaultSelected><code>defaultSelected</code></dfn>
+  IDL attribute must <a href=#reflect>reflect</a> the content attribute of the
+  same name. The <dfn id=dom-option-defaultselected title=dom-option-defaultSelected><code>defaultSelected</code></dfn>
   IDL attribute must <a href=#reflect>reflect</a> the <code title=attr-option-selected><a href=#attr-option-selected>selected</a></code> content attribute.</p>
 
+  <p>The <dfn id=dom-option-label title=dom-option-label><code>label</code></dfn> IDL
+  attribute, on getting, must return the value of the element's <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute, if it has
+  one, or else the value of the element's <code><a href=#textcontent>textContent</a></code> IDL
+  attribute. On setting, the element's <code title=attr-option-label><a href=#attr-option-label>label</a></code> content attribute must be set
+  to the new value.</p>
+
   <p>The <dfn id=dom-option-value title=dom-option-value><code>value</code></dfn> IDL
   attribute, on getting, must return the value of the element's <code title=attr-option-value><a href=#attr-option-value>value</a></code> content attribute, if it has
   one, or else the value of the element's <code><a href=#textcontent>textContent</a></code> IDL

diff --git a/source b/source
@@ -55266,13 +55266,20 @@ interface <dfn>HTMLOptionElement</dfn> : <span>HTMLElement</span> {
   <div class="impl">
 
   <p>The <dfn title="dom-option-disabled"><code>disabled</code></dfn>
-  and <dfn title="dom-option-label"><code>label</code></dfn> IDL
-  attributes must <span>reflect</span> the respective content
-  attributes of the same name. The <dfn
+  IDL attribute must <span>reflect</span> the content attribute of the
+  same name. The <dfn
   title="dom-option-defaultSelected"><code>defaultSelected</code></dfn>
   IDL attribute must <span>reflect</span> the <code
   title="attr-option-selected">selected</code> content attribute.</p>
 
+  <p>The <dfn title="dom-option-label"><code>label</code></dfn> IDL
+  attribute, on getting, must return the value of the element's <code
+  title="attr-option-label">label</code> content attribute, if it has
+  one, or else the value of the element's <code>textContent</code> IDL
+  attribute. On setting, the element's <code
+  title="attr-option-label">label</code> content attribute must be set
+  to the new value.</p>
+
   <p>The <dfn title="dom-option-value"><code>value</code></dfn> IDL
   attribute, on getting, must return the value of the element's <code
   title="attr-option-value">value</code> content attribute, if it has