Skip to content

Commit 0565cf3

Browse files
committed
more cleanup
1 parent 76c62c3 commit 0565cf3

2 files changed

Lines changed: 91 additions & 90 deletions

File tree

cssom/Overview.html

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1743,8 +1743,8 @@ <h4 id=the-cssstylesheet-interface><span class=secno>7.1.1. </span>The
17431743
title="">index</var>)</code></dfn> method, when invoked, <em
17441744
class=ct>must</em> <a href="#removing-a-statement">remove a statement</a>
17451745
where <var>index</var> is <var>index</var> and <var>rule list</var> is
1746-
<code title=cssmediarule-cssrules><a
1747-
href="#cssmediarule-cssrules">cssRules</a></code>.
1746+
<code title=dom-CSSMediaRule-cssRules><a
1747+
href="#dom-cssmediarule-cssrules">cssRules</a></code>.
17481748

17491749
<h3 id=css-rules><span class=secno>7.2. </span>CSS Rules</h3>
17501750

@@ -1990,91 +1990,90 @@ <h4 id=css-style-rule-rule-set><span class=secno>7.2.3. </span>CSS Style
19901990

19911991
<p>The <dfn id=cssstylerule-style
19921992
title=cssstylerule-style><code>style</code></dfn> attribute <em
1993-
class=ct>must</em> return a live <code><a
1993+
class=ct>must</em> return a <code><a
19941994
href="#cssstyledeclaration">CSSStyleDeclaration</a></code> object for the
19951995
rule set.
19961996

19971997
<h4 id=css-import-rule><span class=secno>7.2.4. </span>CSS <code
19981998
title="">@import</code> Rule</h4>
19991999

20002000
<p>The <code><a href="#cssimportrule">CSSImportRule</a></code> object
2001-
represents an <code>@import</code> rule specified (if any) in a <span>CSS
2002-
style sheet</span>.
2001+
represents an <code>@import</code> rule.
20032002

20042003
<pre
20052004
class=idl>interface <dfn id=cssimportrule>CSSImportRule</dfn> : <a href="#cssrule">CSSRule</a> {
2006-
readonly attribute DOMString <a href="#cssimportrule-href" title=cssimportrule-href>href</a>;
2007-
[PutForwards=<a href="#dom-medialist-mediatext" title=dom-MediaList-mediaText>mediaText</a>] readonly attribute <a href="#medialist">MediaList</a> <a href="#cssimportrule-media" title=cssimportrule-media>media</a>;
2008-
readonly attribute <a href="#cssstylesheet">CSSStyleSheet</a> <a href="#cssimportrule-stylesheet" title=cssimportrule-stylesheet>styleSheet</a>;
2005+
readonly attribute DOMString <a href="#dom-cssimportrule-href" title=dom-CSSImportRule-href>href</a>;
2006+
[PutForwards=<a href="#dom-medialist-mediatext" title=dom-MediaList-mediaText>mediaText</a>] readonly attribute <a href="#medialist">MediaList</a> <a href="#dom-cssimportrule-media" title=dom-CSSImportRule-media>media</a>;
2007+
readonly attribute <a href="#cssstylesheet">CSSStyleSheet</a> <a href="#dom-cssimportrule-stylesheet" title=dom-CSSImportRule-styleSheet>styleSheet</a>;
20092008
};</pre>
20102009

2011-
<p>The <dfn id=cssimportrule-href
2012-
title=cssimportrule-href><code>href</code></dfn> attribute, on getting,
2013-
<em class=ct>must</em> return the <em>specified</em> URI of the style
2014-
sheet referenced by the <code>@import</code> rule.
2015-
2016-
<p>The <dfn id=cssimportrule-media
2017-
title=cssimportrule-media><code>media</code></dfn> attribute, on getting,
2018-
<em class=ct>must</em> return a live <code><a
2019-
href="#medialist">MediaList</a></code> object containing a list of media
2020-
queries applicable to the imported style sheet as specified by the
2010+
<p>The <dfn id=dom-cssimportrule-href
2011+
title=dom-CSSImportRule-href><code>href</code></dfn> attribute, on
2012+
getting, <em class=ct>must</em> return the <i>specified</i> <a
2013+
href="#url">URL</a> of the <span>CSS style sheet</span> referenced by the
20212014
<code>@import</code> rule.
20222015

2023-
<p>The <dfn id=cssimportrule-stylesheet
2024-
title=cssimportrule-stylesheet><code>styleSheet</code></dfn> attribute, on
2025-
getting, <em class=ct>must</em> return the <code><a
2016+
<p class=XXX>Returning the <span>absolute URL</span> would be much better,
2017+
but only Opera does this at the moment. Convince Gecko/WebKit?
2018+
2019+
<p>The <dfn id=dom-cssimportrule-media
2020+
title=dom-CSSImportRule-media><code>media</code></dfn> attribute, on
2021+
getting, <em class=ct>must</em> return a <code><a
2022+
href="#medialist">MediaList</a></code> object for the list of media
2023+
queries specified with the <code>@import</code> rule.
2024+
2025+
<p>The <dfn id=dom-cssimportrule-stylesheet
2026+
title=dom-CSSImportRule-stylesheet><code>styleSheet</code></dfn>
2027+
attribute, on getting, <em class=ct>must</em> return the <code><a
20262028
href="#cssstylesheet">CSSStyleSheet</a></code> object that represents the
2027-
referenced (parsed) style sheet from the <code>@import</code> rule.
2029+
referenced (parsed) <span>CSS style sheet</span> from the
2030+
<code>@import</code> rule.
20282031

20292032
<p class=note>If loading of the style sheet fails its <code
2030-
title=cssstylesheet-cssrules><a
2031-
href="#cssstylesheet-cssrules">cssRules</a></code> list is simply empty.
2033+
title=dom-CSSStyleSheet-cssRules>cssRules</code> list is simply empty.
20322034

20332035
<h4 id=css-media-rule><span class=secno>7.2.5. </span>CSS <code
20342036
title="">@media</code> Rule</h4>
20352037

20362038
<p>The <code><a href="#cssmediarule">CSSMediaRule</a></code> object
2037-
represents an <code title="">@media</code> rule specified (if any) in a
2038-
<span>CSS style sheet</span>. It is a single statement that contains zero
2039-
or more rulesets which are contrained by one or more media queries (unless
2040-
one happens to be <code>all</code>).
2039+
represents an <code title="">@media</code> rule.
20412040

20422041
<pre
20432042
class=idl>interface <dfn id=cssmediarule>CSSMediaRule</dfn> : <a href="#cssrule">CSSRule</a> {
2044-
[PutForwards=<a href="#dom-medialist-mediatext" title=dom-MediaList-mediaText>mediaText</a>] readonly attribute <a href="#medialist">MediaList</a> <a href="#cssmediarule-media" title=cssmediarule-media>media</a>;
2045-
readonly attribute <a href="#cssrulelist">CSSRuleList</a> <a href="#cssmediarule-cssrules" title=cssmediarule-cssrules>cssRules</a>;
2046-
unsigned long <a href="#cssmediarule-insertrule" title=cssmediarule-insertrule>insertRule</a>(DOMString <var>rule</var>, in unsigned long <var>index</var>);
2047-
void <a href="#cssmediarule-deleterule" title=cssmediarule-deleterule>deleteRule</a>(unsigned long <var>index</var>);
2043+
[PutForwards=<a href="#dom-medialist-mediatext" title=dom-MediaList-mediaText>mediaText</a>] readonly attribute <a href="#medialist">MediaList</a> <a href="#dom-cssmediarule-media" title=dom-CSSMediaRule-media>media</a>;
2044+
readonly attribute <a href="#cssrulelist">CSSRuleList</a> <a href="#dom-cssmediarule-cssrules" title=dom-CSSMediaRule-cssRules>cssRules</a>;
2045+
unsigned long <a href="#dom-cssmediarule-insertrule" title=dom-CSSMediaRule-insertRule>insertRule</a>(DOMString <var>rule</var>, in unsigned long <var>index</var>);
2046+
void <a href="#dom-cssmediarule-deleterule" title=dom-CSSMediaRule-deleteRule>deleteRule</a>(unsigned long <var>index</var>);
20482047
};</pre>
20492048

2050-
<p>The <dfn id=cssmediarule-media
2051-
title=cssmediarule-media><code>media</code></dfn> attribute, on getting,
2052-
<em class=ct>must</em> return a <code><a
2053-
href="#medialist">MediaList</a></code> object containing a list of media
2049+
<p>The <dfn id=dom-cssmediarule-media
2050+
title=dom-CSSMediaRule-media><code>media</code></dfn> attribute, on
2051+
getting, <em class=ct>must</em> return a <code><a
2052+
href="#medialist">MediaList</a></code> object for the list of media
20542053
queries specified with the <code title="">@media</code> rule.
20552054

2056-
<p>The <dfn id=cssmediarule-cssrules
2057-
title=cssmediarule-cssrules><code>cssRules</code></dfn> attribute, on
2055+
<p>The <dfn id=dom-cssmediarule-cssrules
2056+
title=dom-CSSMediaRule-cssRules><code>cssRules</code></dfn> attribute, on
20582057
getting, <em class=ct>must</em> return a <code><a
2059-
href="#cssrulelist">CSSRuleList</a></code> object containing a list of all
2060-
the rulesets specified within the <code title="">@media</code> rule.
2061-
2062-
<p>The <dfn id=cssmediarule-insertrule
2063-
title=cssmediarule-insertrule><code>insertRule(<var title="">rule</var>,
2064-
<var title="">index</var>)</code></dfn> method, when invoked, <em
2065-
class=ct>must</em> <a href="#inserting-a-statement">insert a statement</a>
2066-
where <var>rule</var> is <var>rule</var>, <var>index</var> is
2067-
<var>index</var> and <var>rule list</var> is <code
2068-
title=cssmediarule-cssrules><a
2069-
href="#cssmediarule-cssrules">cssRules</a></code>.
2070-
2071-
<p>The <dfn id=cssmediarule-deleterule
2072-
title=cssmediarule-deleterule><code>deleteRule(<var
2058+
href="#cssrulelist">CSSRuleList</a></code> object for the list of rules
2059+
specified with the <code title="">@media</code> rule.
2060+
2061+
<p>The <dfn id=dom-cssmediarule-insertrule
2062+
title=dom-CSSMediaRule-insertRule><code>insertRule(<var
2063+
title="">rule</var>, <var title="">index</var>)</code></dfn> method, when
2064+
invoked, <em class=ct>must</em> <a href="#inserting-a-statement">insert a
2065+
statement</a> where <var>rule</var> is <var>rule</var>, <var>index</var>
2066+
is <var>index</var> and <var>rule list</var> is <code
2067+
title=dom-CSSMediaRule-cssRules><a
2068+
href="#dom-cssmediarule-cssrules">cssRules</a></code>.
2069+
2070+
<p>The <dfn id=dom-cssmediarule-deleterule
2071+
title=dom-CSSMediaRule-deleteRule><code>deleteRule(<var
20732072
title="">index</var>)</code></dfn> method, when invoked, <em
20742073
class=ct>must</em> <a href="#removing-a-statement">remove a statement</a>
20752074
where <var>index</var> is <var>index</var> and <var>rule list</var> is
2076-
<code title=cssmediarule-cssrules><a
2077-
href="#cssmediarule-cssrules">cssRules</a></code>.
2075+
<code title=dom-CSSMediaRule-cssRules><a
2076+
href="#dom-cssmediarule-cssrules">cssRules</a></code>.
20782077

20792078
<h4 id=css-font-face-rule><span class=secno>7.2.6. </span>CSS <code
20802079
title="">@font-face</code> Rule</h4>
@@ -3676,7 +3675,7 @@ <h3 id=the-viewcss-interface><span class=secno>8.2. </span>The <code
36763675
};</pre>
36773676

36783677
<p>The <dfn id=viewcss-getcomputedstyle><code>getComputedStyle</code></dfn>
3679-
method <em class=ct>must</em> return a live <code><a
3678+
method <em class=ct>must</em> return a <code><a
36803679
href="#cssstyledeclaration">CSSStyleDeclaration</a></code> object that
36813680
contains the computed style declaration block for <var title="">elt</var>,
36823681
when the <var title="">pseudoElt</var> argument is <code>null</code>, the

cssom/Overview.src.html

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ <h4>The <code title="">CSSStyleSheet</code> Interface</h4>
13991399
<dfn id="cssstylesheet-deleterule" title="cssstylesheet-deleterule"><code>deleteRule(<var title="">index</var>)</code></dfn>
14001400
method, when invoked, <em class="ct">must</em> <span>remove a statement</span>
14011401
where <var>index</var> is <var>index</var> and <var>rule list</var> is
1402-
<code title="cssmediarule-cssrules">cssRules</code>.</p>
1402+
<code title="dom-CSSMediaRule-cssRules">cssRules</code>.</p>
14031403

14041404

14051405
<h3>CSS Rules</h3>
@@ -1603,81 +1603,83 @@ <h4>CSS Style Rule (Rule Set)</h4>
16031603

16041604
<p>The
16051605
<dfn id="cssstylerule-style" title="cssstylerule-style"><code>style</code></dfn>
1606-
attribute <em class="ct">must</em> return a live
1606+
attribute <em class="ct">must</em> return a
16071607
<code>CSSStyleDeclaration</code> object for the rule set.</p>
16081608

16091609

16101610
<h4>CSS <code title="">@import</code> Rule</h4>
16111611

1612-
<p>The <code>CSSImportRule</code> object represents an <code>@import</code>
1613-
rule specified (if any) in a <span>CSS style sheet</span>.</p>
1612+
<p>The <code>CSSImportRule</code> object represents an
1613+
<code>@import</code> rule.</p>
16141614

16151615
<pre class="idl">interface <dfn>CSSImportRule</dfn> : <span>CSSRule</span> {
1616-
readonly attribute DOMString <span title="cssimportrule-href">href</span>;
1617-
[PutForwards=<span title="dom-MediaList-mediaText">mediaText</span>] readonly attribute <span>MediaList</span> <span title="cssimportrule-media">media</span>;
1618-
readonly attribute <span>CSSStyleSheet</span> <span title="cssimportrule-stylesheet">styleSheet</span>;
1616+
readonly attribute DOMString <span title="dom-CSSImportRule-href">href</span>;
1617+
[PutForwards=<span title="dom-MediaList-mediaText">mediaText</span>] readonly attribute <span>MediaList</span> <span title="dom-CSSImportRule-media">media</span>;
1618+
readonly attribute <span>CSSStyleSheet</span> <span title="dom-CSSImportRule-styleSheet">styleSheet</span>;
16191619
};</pre>
16201620

16211621
<p>The
1622-
<dfn id="cssimportrule-href" title="cssimportrule-href"><code>href</code></dfn>
1623-
attribute, on getting, <em class="ct">must</em> return the <em>specified</em>
1624-
URI of the style sheet referenced by the <code>@import</code> rule.</p>
1622+
<dfn id="dom-cssimportrule-href" title="dom-CSSImportRule-href"><code>href</code></dfn>
1623+
attribute, on getting, <em class="ct">must</em> return the
1624+
<i>specified</i> <span>URL</span> of the <span>CSS style sheet</span>
1625+
referenced by the <code>@import</code> rule.</p>
1626+
1627+
<p class="XXX">Returning the <span>absolute URL</span> would be much
1628+
better, but only Opera does this at the moment. Convince Gecko/WebKit?</p>
16251629

16261630
<p>The
1627-
<dfn id="cssimportrule-media" title="cssimportrule-media"><code>media</code></dfn>
1628-
attribute, on getting, <em class="ct">must</em> return a live
1629-
<code>MediaList</code> object containing a list of media queries applicable to
1630-
the imported style sheet as specified by the <code>@import</code> rule.</p>
1631+
<dfn id="dom-cssimportrule-media" title="dom-CSSImportRule-media"><code>media</code></dfn>
1632+
attribute, on getting, <em class="ct">must</em> return a
1633+
<code>MediaList</code> object for the list of media queries specified
1634+
with the <code>@import</code> rule.</p>
16311635

16321636
<p>The
1633-
<dfn id="cssimportrule-stylesheet" title="cssimportrule-stylesheet"><code>styleSheet</code></dfn>
1637+
<dfn id="dom-cssimportrule-stylesheet" title="dom-CSSImportRule-stylesheet"><code>styleSheet</code></dfn>
16341638
attribute, on getting, <em class="ct">must</em> return the
16351639
<code>CSSStyleSheet</code> object that represents the referenced (parsed)
1636-
style sheet from the <code>@import</code> rule.</p>
1640+
<span>CSS style sheet</span> from the <code>@import</code> rule.</p>
16371641

16381642
<p class="note">If loading of the style sheet fails its
1639-
<code title="cssstylesheet-cssrules">cssRules</code> list is simply empty.</p>
1643+
<code title="dom-CSSStyleSheet-cssRules">cssRules</code> list is simply
1644+
empty.</p>
16401645

16411646

16421647
<h4>CSS <code title="">@media</code> Rule</h4>
16431648

16441649
<p>The <code>CSSMediaRule</code> object represents an
1645-
<code title="">@media</code> rule specified (if any) in a <span>CSS style
1646-
sheet</span>. It is a single statement that contains zero or more rulesets
1647-
which are contrained by one or more media queries (unless one happens to be
1648-
<code>all</code>).</p>
1650+
<code title="">@media</code> rule.</p>
16491651

16501652
<pre class="idl">interface <dfn>CSSMediaRule</dfn> : <span>CSSRule</span> {
1651-
[PutForwards=<span title="dom-MediaList-mediaText">mediaText</span>] readonly attribute <span>MediaList</span> <span title="cssmediarule-media">media</span>;
1652-
readonly attribute <span>CSSRuleList</span> <span title="cssmediarule-cssrules">cssRules</span>;
1653-
unsigned long <span title="cssmediarule-insertrule">insertRule</span>(DOMString <var>rule</var>, in unsigned long <var>index</var>);
1654-
void <span title="cssmediarule-deleterule">deleteRule</span>(unsigned long <var>index</var>);
1653+
[PutForwards=<span title="dom-MediaList-mediaText">mediaText</span>] readonly attribute <span>MediaList</span> <span title="dom-CSSMediaRule-media">media</span>;
1654+
readonly attribute <span>CSSRuleList</span> <span title="dom-CSSMediaRule-cssRules">cssRules</span>;
1655+
unsigned long <span title="dom-CSSMediaRule-insertRule">insertRule</span>(DOMString <var>rule</var>, in unsigned long <var>index</var>);
1656+
void <span title="dom-CSSMediaRule-deleteRule">deleteRule</span>(unsigned long <var>index</var>);
16551657
};</pre>
16561658

16571659
<p>The
1658-
<dfn id="cssmediarule-media" title="cssmediarule-media"><code>media</code></dfn>
1660+
<dfn id="dom-cssmediarule-media" title="dom-CSSMediaRule-media"><code>media</code></dfn>
16591661
attribute, on getting, <em class="ct">must</em> return a
1660-
<code>MediaList</code> object containing a list of media queries specified
1662+
<code>MediaList</code> object for the list of media queries specified
16611663
with the <code title="">@media</code> rule.</p>
16621664

16631665
<p>The
1664-
<dfn id="cssmediarule-cssrules" title="cssmediarule-cssrules"><code>cssRules</code></dfn>
1666+
<dfn id="dom-cssmediarule-cssrules" title="dom-CSSMediaRule-cssRules"><code>cssRules</code></dfn>
16651667
attribute, on getting, <em class="ct">must</em> return a
1666-
<code>CSSRuleList</code> object containing a list of all the rulesets
1667-
specified within the <code title="">@media</code> rule.</p>
1668+
<code>CSSRuleList</code> object for the list of rules specified with the
1669+
<code title="">@media</code> rule.</p>
16681670

16691671
<p>The
1670-
<dfn id="cssmediarule-insertrule" title="cssmediarule-insertrule"><code>insertRule(<var title="">rule</var>,
1672+
<dfn id="dom-cssmediarule-insertrule" title="dom-CSSMediaRule-insertRule"><code>insertRule(<var title="">rule</var>,
16711673
<var title="">index</var>)</code></dfn> method, when invoked,
16721674
<em class="ct">must</em> <span>insert a statement</span> where <var>rule</var>
16731675
is <var>rule</var>, <var>index</var> is <var>index</var> and <var>rule
1674-
list</var> is <code title="cssmediarule-cssrules">cssRules</code>.</dd>
1676+
list</var> is <code title="dom-CSSMediaRule-cssRules">cssRules</code>.</dd>
16751677

16761678
<p>The
1677-
<dfn id="cssmediarule-deleterule" title="cssmediarule-deleterule"><code>deleteRule(<var title="">index</var>)</code></dfn>
1679+
<dfn id="dom-cssmediarule-deleterule" title="dom-CSSMediaRule-deleteRule"><code>deleteRule(<var title="">index</var>)</code></dfn>
16781680
method, when invoked, <em class="ct">must</em> <span>remove a statement</span>
16791681
where <var>index</var> is <var>index</var> and <var>rule list</var> is
1680-
<code title="cssmediarule-cssrules">cssRules</code>.</p>
1682+
<code title="dom-CSSMediaRule-cssRules">cssRules</code>.</p>
16811683

16821684

16831685
<h4>CSS <code title="">@font-face</code> Rule</h4>
@@ -2312,7 +2314,7 @@ <h3>The <code title="">ViewCSS</code> Interface</h3>
23122314

23132315
<p>The
23142316
<dfn id="viewcss-getcomputedstyle"><code>getComputedStyle</code></dfn>
2315-
method <em class="ct">must</em> return a live
2317+
method <em class="ct">must</em> return a
23162318
<code>CSSStyleDeclaration</code> object that contains the computed style
23172319
declaration block for <var title="">elt</var>, when the
23182320
<var title="">pseudoElt</var> argument is <code>null</code>, the empty string

0 commit comments

Comments
 (0)