Skip to content

Commit 82e8f07

Browse files
author
Sylvain Galineau
committed
[css-animations] Clarify findRule/deleteRule behavior (bug 14788)
1 parent 1d83983 commit 82e8f07

2 files changed

Lines changed: 33 additions & 37 deletions

File tree

css-animations/Overview.bs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -934,8 +934,8 @@ IDL Definition</h4>
934934
readonly attribute CSSRuleList cssRules;
935935

936936
void appendRule(DOMString rule);
937-
void deleteRule(DOMString key);
938-
CSSKeyframeRule? findRule(DOMString key);
937+
void deleteRule(DOMString select);
938+
CSSKeyframeRule? findRule(DOMString select);
939939
};
940940
</pre>
941941

@@ -982,20 +982,19 @@ The <code>appendRule</code> method</h4>
982982
<h4 id="interface-csskeyframesrule-deleterule">
983983
The <code>deleteRule</code> method</h4>
984984

985-
The <dfn method for="CSSKeyframesRule">deleteRule()</dfn> deletes the <a idl>CSSKeyframeRule</a>
986-
with the passed key. If a rule with this key does not exist, the method does nothing.
987-
988-
If multiple rules are specified for the passed key, the last one is deleted.
985+
The <dfn method for="CSSKeyframesRule">deleteRule()</dfn> deletes the
986+
last declared <a idl>CSSKeyframeRule</a> matching the specified keyframe selector.
987+
If no matching rule exists, the method does nothing.
989988

990989
Parameters:
991990

992991
<dl>
993992

994-
<dt><dfn argument for="CSSKeyframesRule/deleteRule()">key</dfn> of type <a interface>DOMString</a>
993+
<dt><dfn argument for="CSSKeyframesRule/deleteRule()">select</dfn> of type <a interface>DOMString</a>
995994
<dd>
996-
The keyframe selector of the rule to be deleted: a comma-separated list of either percentage values between 0% and 100% or one of the keywords ''from'' or ''to'', which resolve to 0% and 100%, respectively.
995+
The keyframe selector of the rule to be deleted: a comma-separated list of percentage values between 0% and 100% or the keywords ''from'' or ''to'' which resolve to 0% and 100%, respectively.
997996

998-
The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white-space.
997+
The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white space around the values in the list.
999998
</dl>
1000999

10011000
No Return Value
@@ -1006,19 +1005,18 @@ The <code>deleteRule</code> method</h4>
10061005
<h4 id="interface-csskeyframesrule-findrule">
10071006
The <code>findRule</code> method</h4>
10081007

1009-
The <dfn method for="CSSKeyframesRule">findRule()</dfn> returns the rule with a key matching
1010-
the passed key. If no such rule exists, a null value is returned.
1011-
1012-
If multiple rules are specified for the passed key, the last one is returned.
1008+
The <dfn method for="CSSKeyframesRule">findRule()</dfn> returns the
1009+
last declared <a idl>CSSKeyframeRule</a> matching the specified keyframe selector.
1010+
If no matching rule exists, the method does nothing.
10131011

10141012
Parameters:
10151013

10161014
<dl>
1017-
<dt><dfn argument for="CSSKeyframesRule/findRule()">key</dfn> of type <a interface>DOMString</a>
1015+
<dt><dfn argument for="CSSKeyframesRule/findRule()">select</dfn> of type <a interface>DOMString</a>
10181016
<dd>
1019-
The keyframe selector of the rule to be retrieved: a comma-separated list of either percentage values between 0% and 100% or one of the keywords ''from'' or ''to'', which resolve to 0% and 100%, respectively.
1017+
The keyframe selector of the rule to be deleted: a comma-separated list of percentage values between 0% and 100% or the keywords ''from'' or ''to'' which resolve to 0% and 100%, respectively.
10201018

1021-
The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white-space.
1019+
The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white space around the values in the list.
10221020
</dl>
10231021

10241022
Return Value:

css-animations/Overview.html

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</p>
5757
<h1 class="p-name no-ref" id=title>CSS Animations Level 1</h1>
5858
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
59-
<span class=dt-updated><span class=value-title title=20141208>8 December 2014</span></span></span></h2>
59+
<span class=dt-updated><span class=value-title title=20150109>9 January 2015</span></span></span></h2>
6060
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css3-animations/>http://dev.w3.org/csswg/css3-animations/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css3-animations/>http://www.w3.org/TR/css3-animations/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css3-animations/>http://dev.w3.org/csswg/css3-animations/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2013/WD-css3-animations-20130219/ rel=previous>http://www.w3.org/TR/2013/WD-css3-animations-20130219/</a><dd><a href=http://www.w3.org/TR/2012/WD-css3-animations-20120403/ rel=previous>http://www.w3.org/TR/2012/WD-css3-animations-20120403/</a>
6161
<dt>Feedback:</dt>
6262
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-animations%5D%20feedback">www-style@w3.org</a>
@@ -950,8 +950,8 @@ <h4 class="heading settled heading" data-level=6.3.1 id=interface-csskeyframesru
950950
readonly attribute <a data-link-type=idl href=http://dev.w3.org/csswg/cssom-1/#cssrulelist title=cssrulelist>CSSRuleList</a> <a class=idl-code data-global-name="CSSKeyframesRule<interface>/cssrules<attribute>" data-link-for=CSSKeyframesRule data-link-type=attribute href=#dom-csskeyframesrule-cssrules title=cssrules>cssRules</a>;
951951

952952
void <a class=idl-code data-global-name="CSSKeyframesRule<interface>/appendrule()<method>" data-link-for=CSSKeyframesRule data-link-type=method href=#dom-csskeyframesrule-appendrule title=appendrule()>appendRule</a>(DOMString <a class=idl-code data-global-name="CSSKeyframesRule<interface>/appendRule()<method>/rule<argument>" data-link-for=CSSKeyframesRule/appendRule() data-link-type=argument href=#dom-csskeyframesruleappendrule-rule title=rule>rule</a>);
953-
void <a class=idl-code data-global-name="CSSKeyframesRule<interface>/deleterule()<method>" data-link-for=CSSKeyframesRule data-link-type=method href=#dom-csskeyframesrule-deleterule title=deleterule()>deleteRule</a>(DOMString <a class=idl-code data-global-name="CSSKeyframesRule<interface>/deleteRule()<method>/key<argument>" data-link-for=CSSKeyframesRule/deleteRule() data-link-type=argument href=#dom-csskeyframesruledeleterule-key title=key>key</a>);
954-
<a data-link-type=idl href=#dom-csskeyframerule title=csskeyframerule>CSSKeyframeRule</a>? <a class=idl-code data-global-name="CSSKeyframesRule<interface>/findrule()<method>" data-link-for=CSSKeyframesRule data-link-type=method href=#dom-csskeyframesrule-findrule title=findrule()>findRule</a>(DOMString <a class=idl-code data-global-name="CSSKeyframesRule<interface>/findRule()<method>/key<argument>" data-link-for=CSSKeyframesRule/findRule() data-link-type=argument href=#dom-csskeyframesrulefindrule-key title=key>key</a>);
953+
void <a class=idl-code data-global-name="CSSKeyframesRule<interface>/deleterule()<method>" data-link-for=CSSKeyframesRule data-link-type=method href=#dom-csskeyframesrule-deleterule title=deleterule()>deleteRule</a>(DOMString <a class=idl-code data-global-name="CSSKeyframesRule<interface>/deleteRule()<method>/select<argument>" data-link-for=CSSKeyframesRule/deleteRule() data-link-type=argument href=#dom-csskeyframesruledeleterule-select title=select>select</a>);
954+
<a data-link-type=idl href=#dom-csskeyframerule title=csskeyframerule>CSSKeyframeRule</a>? <a class=idl-code data-global-name="CSSKeyframesRule<interface>/findrule()<method>" data-link-for=CSSKeyframesRule data-link-type=method href=#dom-csskeyframesrule-findrule title=findrule()>findRule</a>(DOMString <a class=idl-code data-global-name="CSSKeyframesRule<interface>/findRule()<method>/select<argument>" data-link-for=CSSKeyframesRule/findRule() data-link-type=argument href=#dom-csskeyframesrulefindrule-select title=select>select</a>);
955955
};
956956
</pre>
957957
<h4 class="heading settled heading" data-level=6.3.2 id=interface-csskeyframesrule-attributes><span class=secno>6.3.2 </span><span class=content>
@@ -997,20 +997,19 @@ <h4 class="heading settled heading" data-level=6.3.3 id=interface-csskeyframesru
997997
<h4 class="heading settled heading" data-level=6.3.4 id=interface-csskeyframesrule-deleterule><span class=secno>6.3.4 </span><span class=content>
998998
The <code>deleteRule</code> method</span><a class=self-link href=#interface-csskeyframesrule-deleterule></a></h4>
999999

1000-
<p> The <dfn class=idl-code data-dfn-for=CSSKeyframesRule data-dfn-type=method data-export="" id=dom-csskeyframesrule-deleterule title=deleterule()>deleteRule()<a class=self-link href=#dom-csskeyframesrule-deleterule></a></dfn> deletes the <a data-link-type=idl href=#dom-csskeyframerule title=csskeyframerule>CSSKeyframeRule</a>
1001-
with the passed key. If a rule with this key does not exist, the method does nothing.
1002-
1003-
<p> If multiple rules are specified for the passed key, the last one is deleted.
1000+
<p> The <dfn class=idl-code data-dfn-for=CSSKeyframesRule data-dfn-type=method data-export="" id=dom-csskeyframesrule-deleterule title=deleterule()>deleteRule()<a class=self-link href=#dom-csskeyframesrule-deleterule></a></dfn> deletes the
1001+
last declared <a data-link-type=idl href=#dom-csskeyframerule title=csskeyframerule>CSSKeyframeRule</a> matching the specified keyframe selector.
1002+
If no matching rule exists, the method does nothing.
10041003

10051004
<p> Parameters:
10061005

10071006
<dl>
10081007

1009-
<dt><dfn class=idl-code data-dfn-for=CSSKeyframesRule/deleteRule() data-dfn-type=argument data-export="" id=dom-csskeyframesruledeleterule-key>key<a class=self-link href=#dom-csskeyframesruledeleterule-key></a></dfn> of type <a class=idl-code data-link-type=interface title=domstring>DOMString</a>
1008+
<dt><dfn class=idl-code data-dfn-for=CSSKeyframesRule/deleteRule() data-dfn-type=argument data-export="" id=dom-csskeyframesruledeleterule-select>select<a class=self-link href=#dom-csskeyframesruledeleterule-select></a></dfn> of type <a class=idl-code data-link-type=interface title=domstring>DOMString</a>
10101009
<dd>
1011-
The keyframe selector of the rule to be deleted: a comma-separated list of either percentage values between 0% and 100% or one of the keywords <span class=css data-link-type=maybe title=from>from</span> or <span class=css data-link-type=maybe title=to>to</span>, which resolve to 0% and 100%, respectively.
1010+
The keyframe selector of the rule to be deleted: a comma-separated list of percentage values between 0% and 100% or the keywords <span class=css data-link-type=maybe title=from>from</span> or <span class=css data-link-type=maybe title=to>to</span> which resolve to 0% and 100%, respectively.
10121011

1013-
<p> The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white-space.
1012+
<p> The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white space around the values in the list.
10141013
</dl>
10151014

10161015
<p> No Return Value
@@ -1021,19 +1020,18 @@ <h4 class="heading settled heading" data-level=6.3.4 id=interface-csskeyframesru
10211020
<h4 class="heading settled heading" data-level=6.3.5 id=interface-csskeyframesrule-findrule><span class=secno>6.3.5 </span><span class=content>
10221021
The <code>findRule</code> method</span><a class=self-link href=#interface-csskeyframesrule-findrule></a></h4>
10231022

1024-
<p> The <dfn class=idl-code data-dfn-for=CSSKeyframesRule data-dfn-type=method data-export="" id=dom-csskeyframesrule-findrule title=findrule()>findRule()<a class=self-link href=#dom-csskeyframesrule-findrule></a></dfn> returns the rule with a key matching
1025-
the passed key. If no such rule exists, a null value is returned.
1026-
1027-
<p> If multiple rules are specified for the passed key, the last one is returned.
1023+
<p> The <dfn class=idl-code data-dfn-for=CSSKeyframesRule data-dfn-type=method data-export="" id=dom-csskeyframesrule-findrule title=findrule()>findRule()<a class=self-link href=#dom-csskeyframesrule-findrule></a></dfn> returns the
1024+
last declared <a data-link-type=idl href=#dom-csskeyframerule title=csskeyframerule>CSSKeyframeRule</a> matching the specified keyframe selector.
1025+
If no matching rule exists, the method does nothing.
10281026

10291027
<p> Parameters:
10301028

10311029
<dl>
1032-
<dt><dfn class=idl-code data-dfn-for=CSSKeyframesRule/findRule() data-dfn-type=argument data-export="" id=dom-csskeyframesrulefindrule-key>key<a class=self-link href=#dom-csskeyframesrulefindrule-key></a></dfn> of type <a class=idl-code data-link-type=interface title=domstring>DOMString</a>
1030+
<dt><dfn class=idl-code data-dfn-for=CSSKeyframesRule/findRule() data-dfn-type=argument data-export="" id=dom-csskeyframesrulefindrule-select>select<a class=self-link href=#dom-csskeyframesrulefindrule-select></a></dfn> of type <a class=idl-code data-link-type=interface title=domstring>DOMString</a>
10331031
<dd>
1034-
The keyframe selector of the rule to be retrieved: a comma-separated list of either percentage values between 0% and 100% or one of the keywords <span class=css data-link-type=maybe title=from>from</span> or <span class=css data-link-type=maybe title=to>to</span>, which resolve to 0% and 100%, respectively.
1032+
The keyframe selector of the rule to be deleted: a comma-separated list of percentage values between 0% and 100% or the keywords <span class=css data-link-type=maybe title=from>from</span> or <span class=css data-link-type=maybe title=to>to</span> which resolve to 0% and 100%, respectively.
10351033

1036-
<p> The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white-space.
1034+
<p> The number and order of the values in the specified keyframe selector must match those of the targeted keyframe rule(s). The match is not sensitive to white space around the values in the list.
10371035
</dl>
10381036

10391037
<p> Return Value:
@@ -1285,9 +1283,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
12851283
</ul><li>findrule(), <a href=#dom-csskeyframesrule-findrule title="section 6.3.5">6.3.5</a>
12861284
<li>forwards, <a href=#valuedef-forwards title="section 4.9">4.9</a>
12871285
<li>infinite, <a href=#valuedef-infinite title="section 4.5">4.5</a>
1288-
<li>key<ul><li>argument for CSSKeyframesRule/deleteRule(), <a href=#dom-csskeyframesruledeleterule-key title="section 6.3.4">6.3.4</a>
1289-
<li>argument for CSSKeyframesRule/findRule(), <a href=#dom-csskeyframesrulefindrule-key title="section 6.3.5">6.3.5</a>
1290-
</ul><li>KEYFRAME_RULE, <a href=#dom-cssrule-keyframe_rule title="section 6.1.1">6.1.1</a>
1286+
<li>KEYFRAME_RULE, <a href=#dom-cssrule-keyframe_rule title="section 6.1.1">6.1.1</a>
12911287
<li>@keyframes, <a href=#at-ruledef-keyframes title="section 4">4</a>
12921288
<li>KEYFRAMES_RULE, <a href=#dom-cssrule-keyframes_rule title="section 6.1.1">6.1.1</a>
12931289
<li>keyText, <a href=#dom-csskeyframerule-keytext title="section 6.2.2">6.2.2</a>
@@ -1302,7 +1298,9 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
13021298
</ul><li>reverse, <a href=#valuedef-reverse title="section 4.6">4.6</a>
13031299
<li>rule, <a href=#dom-csskeyframesruleappendrule-rule title="section 6.3.3">6.3.3</a>
13041300
<li>running, <a href=#valuedef-running title="section 4.7">4.7</a>
1305-
<li>&lt;single-animation&gt;, <a href=#typedef-single-animation title="section 4.10">4.10</a>
1301+
<li>select<ul><li>argument for CSSKeyframesRule/deleteRule(), <a href=#dom-csskeyframesruledeleterule-select title="section 6.3.4">6.3.4</a>
1302+
<li>argument for CSSKeyframesRule/findRule(), <a href=#dom-csskeyframesrulefindrule-select title="section 6.3.5">6.3.5</a>
1303+
</ul><li>&lt;single-animation&gt;, <a href=#typedef-single-animation title="section 4.10">4.10</a>
13061304
<li>&lt;single-animation-direction&gt;, <a href=#typedef-single-animation-direction title="section 4.6">4.6</a>
13071305
<li>&lt;single-animation-fill-mode&gt;, <a href=#typedef-single-animation-fill-mode title="section 4.9">4.9</a>
13081306
<li>&lt;single-animation-iteration-count&gt;, <a href=#typedef-single-animation-iteration-count title="section 4.5">4.5</a>

0 commit comments

Comments
 (0)