1.1 --- a/cssom/Overview.html Fri Aug 16 17:05:57 2013 -0700 1.2 +++ b/cssom/Overview.html Sun Aug 18 23:23:45 2013 +0200 1.3 @@ -16,7 +16,7 @@ 1.4 <h1>CSS Object Model (CSSOM)</h1> 1.5 1.6 1.7 - <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 14 August 2013</h2> 1.8 + <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 18 August 2013</h2> 1.9 1.10 <dl> 1.11 1.12 @@ -90,7 +90,7 @@ 1.13 can be found in the 1.14 <a href="http://www.w3.org/TR/">W3C technical reports index at http://www.w3.org/TR/.</a></em> 1.15 1.16 -<p class="dontpublish">This is the 14 August 2013 Editor's Draft of CSSOM. Please send comments to 1.17 +<p class="dontpublish">This is the 18 August 2013 Editor's Draft of CSSOM. Please send comments to 1.18 <a href="mailto:www-style@w3.org?subject=%5Bcssom%5D%20">www-style@w3.org</a> 1.19 (<a href="http://lists.w3.org/Archives/Public/www-style/">archived</a>) 1.20 with <samp>[cssom]</samp> at the start of the subject line. 1.21 @@ -2219,7 +2219,7 @@ 1.22 DOMString <a href="#dom-cssstyledeclaration-getpropertyvalue" title="dom-CSSStyleDeclaration-getPropertyValue">getPropertyValue</a>(DOMString property); 1.23 DOMString <a href="#dom-cssstyledeclaration-getpropertypriority" title="dom-CSSStyleDeclaration-getPropertyPriority">getPropertyPriority</a>(DOMString property); 1.24 void <a href="#dom-cssstyledeclaration-setproperty" title="dom-CSSStyleDeclaration-setProperty">setProperty</a>(DOMString property, [TreatNullAs=EmptyString] DOMString value, <!-- 1.25 - -->[TreatNullAs=EmptyString] optional DOMString priority = ""); 1.26 + -->[TreatNullAs=EmptyString] optional DOMString priority); 1.27 DOMString <a href="#dom-cssstyledeclaration-removeproperty" title="dom-CSSStyleDeclaration-removeProperty">removeProperty</a>(DOMString property); 1.28 readonly attribute <a href="#cssrule">CSSRule</a>? <a href="#dom-cssstyledeclaration-length" title="dom-CSSStyleDeclaration-length">parentRule</a>; 1.29 attribute DOMString <a href="#dom-cssstyledeclaration-cssfloat" title="dom-CSSStyleDeclaration-cssFloat">cssFloat</a>;<!-- setProperty's value arg has [TreatNullAs=EmptyString] --> 1.30 @@ -2303,8 +2303,9 @@ 1.31 algorithm.</li> 1.32 <li><p>If <var>value</var> is the empty string, invoke <code title="dom-CSSStyleDeclaration-removeProperty"><a href="#dom-cssstyledeclaration-removeproperty">removeProperty()</a></code> 1.33 with <var>property</var> as argument and terminate this algorithm.</li> 1.34 - <li><p>If <var>priority</var> is neither an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII case-insensitive</a> match for the string "<code title="">important</code>" 1.35 - nor the empty string terminate this algorithm.</li> 1.36 + <li><p>If <var>priority</var> is not specified, let <var>priority action</var> be "leave as is". Otherwise, if <var>priority</var> is the empty string, let 1.37 + <var>priority action</var> be "unset important". Otherwise, if <var>priority</var> is an <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#ascii-case-insensitive">ASCII case-insensitive</a> match for the 1.38 + string "<code title="">important</code>", set <var>priority action</var> to "set important". Otherwise, terminate this algorithm. 1.39 <li> 1.40 <p>Let <var>component value list</var> be the result of <a href="#parse-a-css-value" title="parse a CSS value">parsing</a> <var>value</var>. 1.41 <p class="note"><var>value</var> can not include "<code title="">!important</code>".</p> 1.42 @@ -2312,15 +2313,15 @@ 1.43 <li><p>If <var>component value list</var> is null terminate these steps. 1.44 <li><p>If <var>property</var> is a shorthand property, then for each longhand property <var>longhand</var> that <var>property</var> maps to, in canonical 1.45 order, <a href="#set-a-css-property" title="set a CSS property">set the CSS property</a> <var>longhand</var> to the appropriate value(s) from <var>component value list</var>, with 1.46 - the <var>important</var> flag set if <var>priority</var> is not the empty string, and with the list of declarations being the 1.47 + <i>priority action</i> being <var>priority action</var>, and with the list of declarations being the 1.48 <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a>. 1.49 <li><p>Otherwise, <a href="#set-a-css-property" title="set a CSS property">set the CSS property</a> <var>property</var> to <var>component value list</var>, with 1.50 - the <var>important</var> flag set if <var>priority</var> is not the empty string, and with the list of declarations being the 1.51 + <i>priority action</i> being <var>priority action</var>, and with the list of declarations being the 1.52 <a href="#concept-css-declaration-block-declarations" title="concept-css-declaration-block-declarations">declarations</a>. 1.53 </ol> 1.54 1.55 -<p>To <dfn id="set-a-css-property">set a CSS property</dfn> <var>property</var> to a value <var>component value list</var> and optionally with an <var>important</var> flag set, in a 1.56 -list of declarations <var>declarations</var>, follow these steps: 1.57 +<p>To <dfn id="set-a-css-property">set a CSS property</dfn> <var>property</var> to a value <var>component value list</var> and with <i>priority action</i> being either "set 1.58 +important", "unset important" or "leave as is", in a list of declarations <var>declarations</var>, follow these steps: 1.59 1.60 <ol> 1.61 <li><p>If <var>property</var> is a <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#case-sensitive">case-sensitive</a> match for a property of a declaration in 1.62 @@ -2328,7 +2329,8 @@ 1.63 <li><p>Otherwise, append a new declaration with the property name <var>property</var> to <var>declarations</var> and let <var>declaration</var> be that 1.64 declaration. 1.65 <li><p>Set <var>declaration</var>'s value to <var>component value list</var>. 1.66 - <li><p>Set the declaration's <i>important</i> flag if <var>important</var> is set, or unset it otherwise. 1.67 + <li><p>If <i>priority action</i> is "set important", set the declaration's <i>important</i> flag. 1.68 + <li><p>Otherwise, if <i>priority action</i> is "unset important", unset the declaration's <i>important</i> flag. 1.69 </ol> 1.70 1.71 <p>The <dfn id="dom-cssstyledeclaration-removeproperty" title="dom-CSSStyleDeclaration-removeProperty"><code>removeProperty(<var>property</var>)</code></dfn> method must run these steps:</p> 1.72 @@ -3070,6 +3072,7 @@ 1.73 Mike Sherov, 1.74 Morten Stenshorne, 1.75 Øyvind Stenhaug, 1.76 +Peter Sloetjes, 1.77 Philip Taylor, 1.78 Robert O'Callahan, 1.79 Simon Sapin,