Skip to content

Commit b8e3bcc

Browse files
committed
[mediaqueries] script => scripting
--HG-- extra : rebase_source : 9a92ef99c4a82d4d0ca8ec00ecb9429cb1c8b277
1 parent 9a9d38e commit b8e3bcc

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

mediaqueries/Overview.html

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,9 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
153153
pointer</a><li><a href=#hover><span class=secno>7.2</span>
154154
hover</a></ul><li><a href=#mf-environment><span class=secno>8</span>
155155
Environment Media Features</a><ul class=toc><li><a href=#light-level><span class=secno>8.1</span>
156-
light-level</a></ul><li><a href=#mf-script><span class=secno>9</span>
157-
Scripting Media Features</a><ul class=toc><li><a href=#script><span class=secno>9.1</span>
158-
script</a></ul><li><a href=#assorted-issues><span class=secno>10</span>
156+
light-level</a></ul><li><a href=#mf-scripting><span class=secno>9</span>
157+
Scripting Media Features</a><ul class=toc><li><a href=#scripting><span class=secno>9.1</span>
158+
scripting</a></ul><li><a href=#assorted-issues><span class=secno>10</span>
159159
Assorted Issues</a><li><a href=#changes><span class=secno></span>
160160
Changes</a><ul class=toc><li><a href=#changes-2012><span class=secno></span>
161161
Changes Since the Media Queries Level 3</a></ul><li><a href=#acknowledgments><span class=secno></span>
@@ -748,7 +748,7 @@ <h4 class="heading settled heading" data-level=2.4.1 id=mq-ranges><span class=se
748748
<p> Every media feature defines its “type” as either “range” or “discrete” in its definition table.
749749

750750
<p> “Discrete” media features,
751-
like <a class=property data-link-type=propdesc href=#descdef-light-level title=light-level>light-level</a> or <a class=property data-link-type=propdesc href=#descdef-script title=script>script</a>,
751+
like <a class=property data-link-type=propdesc href=#descdef-light-level title=light-level>light-level</a> or <a class=property data-link-type=propdesc href=#descdef-scripting title=scripting>scripting</a>,
752752
take their values from a set.
753753
The values may be keywords
754754
or boolean numbers (0 and 1),
@@ -795,12 +795,12 @@ <h4 class="heading settled heading" data-level=2.4.2 id=mq-boolean-context><span
795795
<div class=example>
796796
Some <a data-link-type=dfn href=#media-feature title="media features">media features</a> are designed to be written like this.
797797

798-
<p> For example, <a class=property data-link-type=propdesc href=#descdef-script title=script>script</a> is typically written as <span class=css data-link-type=maybe title=(script)>(script)</span> to test if scripting is enabled,
799-
or <span class=css data-link-type=maybe title="not (script)">not (script)</span> to see if it’s disabled.
798+
<p> For example, <a class=property data-link-type=propdesc href=#descdef-scripting title=scripting>scripting</a> is typically written as <span class=css data-link-type=maybe title=(scripting)>(scripting)</span> to test if scripting is enabled,
799+
or <span class=css data-link-type=maybe title="not (scripting)">not (scripting)</span> to see if it’s disabled.
800800

801801
<p> It can still be given an explicit value as well,
802-
with <span class=css data-link-type=maybe title="(script: enabled)">(script: enabled)</span> equal to <span class=css data-link-type=maybe title=(script)>(script)</span>,
803-
and <span class=css data-link-type=maybe title="(script: none)">(script: none)</span> equal to <span class=css data-link-type=maybe title="not (script)">not (script)</span>.
802+
with <span class=css data-link-type=maybe title="(scripting: enabled)">(scripting: enabled)</span> equal to <span class=css data-link-type=maybe title=(scripting)>(scripting)</span>,
803+
and <span class=css data-link-type=maybe title="(scripting: none)">(scripting: none)</span> equal to <span class=css data-link-type=maybe title="not (scripting)">not (scripting)</span>.
804804
</div>
805805

806806
<div class=example>
@@ -1839,23 +1839,23 @@ <h3 class="heading settled heading" data-level=8.1 id=light-level><span class=se
18391839

18401840

18411841

1842-
<h2 class="heading settled heading" data-level=9 id=mf-script><span class=secno>9 </span><span class=content>
1843-
Scripting Media Features</span><a class=self-link href=#mf-script></a></h2>
1842+
<h2 class="heading settled heading" data-level=9 id=mf-scripting><span class=secno>9 </span><span class=content>
1843+
Scripting Media Features</span><a class=self-link href=#mf-scripting></a></h2>
18441844

1845-
<h3 class="heading settled heading" data-level=9.1 id=script><span class=secno>9.1 </span><span class=content>
1846-
script</span><a class=self-link href=#script></a></h3>
1845+
<h3 class="heading settled heading" data-level=9.1 id=scripting><span class=secno>9.1 </span><span class=content>
1846+
scripting</span><a class=self-link href=#scripting></a></h3>
18471847

1848-
<table class="definition descdef mq" data-dfn-for=@media><tr><th>Name:<td><dfn class=css-code data-dfn-for=@media data-dfn-type=descriptor data-export="" id=descdef-script>script<a class=self-link href=#descdef-script></a></dfn><tr><th>For:<td><a class=css-code data-link-type=at-rule href=http://dev.w3.org/csswg/css-conditional-3/#at-ruledef-media title=@media>@media</a><tr><th>Value:<td>none | enabled<tr><th>Type:<td>discrete</table>
1849-
<p> The <a class=property data-link-type=propdesc href=#descdef-script title=script>script</a> media feature is used to query whether ECMAscript is supported
1848+
<table class="definition descdef mq" data-dfn-for=@media><tr><th>Name:<td><dfn class=css-code data-dfn-for=@media data-dfn-type=descriptor data-export="" id=descdef-scripting>scripting<a class=self-link href=#descdef-scripting></a></dfn><tr><th>For:<td><a class=css-code data-link-type=at-rule href=http://dev.w3.org/csswg/css-conditional-3/#at-ruledef-media title=@media>@media</a><tr><th>Value:<td>none | enabled<tr><th>Type:<td>discrete</table>
1849+
<p> The <a class=property data-link-type=propdesc href=#descdef-scripting title=scripting>scripting</a> media feature is used to query whether ECMAscript is supported
18501850
on the current document.
18511851

1852-
<dl data-dfn-for=@media/script data-dfn-type=value>
1853-
<dt><dfn class=css-code data-dfn-for=@media/script data-dfn-type=value data-export="" id=valuedef-enabled>enabled<a class=self-link href=#valuedef-enabled></a></dfn>
1852+
<dl data-dfn-for=@media/scripting data-dfn-type=value>
1853+
<dt><dfn class=css-code data-dfn-for=@media/scripting data-dfn-type=value data-export="" id=valuedef-enabled>enabled<a class=self-link href=#valuedef-enabled></a></dfn>
18541854
<dd>
18551855
Indicates that the user agent supports ECMAscript
18561856
and that support is active for the current document.
18571857

1858-
<dt><dfn class=css-code data-dfn-for=@media/script data-dfn-type=value data-export="" id=valuedef-none>none<a class=self-link href=#valuedef-none></a></dfn>
1858+
<dt><dfn class=css-code data-dfn-for=@media/scripting data-dfn-type=value data-export="" id=valuedef-none>none<a class=self-link href=#valuedef-none></a></dfn>
18591859
<dd>
18601860
Indicates that the user agent will not run scripts for this document;
18611861
either it doesn’t support ECMAScript,
@@ -1864,10 +1864,10 @@ <h3 class="heading settled heading" data-level=9.1 id=script><span class=secno>9
18641864

18651865
<p> Some user agents have the ability to turn off ECMAscript support on a per script basis or per domain basis,
18661866
allowing some, but not all, scripts to run in a particular document.
1867-
The <a class=property data-link-type=propdesc href=#descdef-script title=script>script</a> media feature does not allow fine grained detection of which script is allowed to run.
1868-
In this scenario, the value of the <a class=property data-link-type=propdesc href=#descdef-script title=script>script</a> media feature should be <a class=css data-link-for=script data-link-type=maybe href=#valuedef-enabled title=enabled>enabled</a>
1867+
The <a class=property data-link-type=propdesc href=#descdef-scripting title=scripting>scripting</a> media feature does not allow fine grained detection of which script is allowed to run.
1868+
In this scenario, the value of the <a class=property data-link-type=propdesc href=#descdef-scripting title=scripting>scripting</a> media feature should be <a class=css data-link-for=scripting data-link-type=maybe href=#valuedef-enabled title=enabled>enabled</a>
18691869
if scripts originating on the same domain as the document are allowed to run,
1870-
and <a class=css data-link-for=script data-link-type=maybe href=#valuedef-none title=none>none</a> otherwise.
1870+
and <a class=css data-link-for=scripting data-link-type=maybe href=#valuedef-none title=none>none</a> otherwise.
18711871

18721872
<p class=note> Note: A future level of CSS may extend this media feature to allow fine-grained detection of which script is allowed to run.
18731873

@@ -1940,7 +1940,7 @@ <h3 class="heading settled heading" id=changes-2012><span class=content>
19401940
<a data-link-type=dfn href=#media-feature title="media features">Media features</a> with numeric values can now be written in a <a href=mq-range-context>range context</a>.
19411941

19421942
<li>
1943-
The <a class=property data-link-type=propdesc href=#descdef-script title=script>script</a>, <a class=property data-link-type=propdesc href=#descdef-pointer title=pointer>pointer</a>, <a class=property data-link-type=propdesc href=#descdef-hover title=hover>hover</a>, <a class=property data-link-type=propdesc href=#descdef-light-level title=light-level>light-level</a>, <a class=property data-link-type=propdesc href=#descdef-updates title=updates>updates</a>, <a class=property data-link-type=propdesc href=#descdef-overflow-block title=overflow-block>overflow-block</a>, and <a class=property data-link-type=propdesc href=#descdef-overflow-inline title=overflow-inline>overflow-inline</a> media features were added.
1943+
The <a class=property data-link-type=propdesc href=#descdef-scripting title=scripting>scripting</a>, <a class=property data-link-type=propdesc href=#descdef-pointer title=pointer>pointer</a>, <a class=property data-link-type=propdesc href=#descdef-hover title=hover>hover</a>, <a class=property data-link-type=propdesc href=#descdef-light-level title=light-level>light-level</a>, <a class=property data-link-type=propdesc href=#descdef-updates title=updates>updates</a>, <a class=property data-link-type=propdesc href=#descdef-overflow-block title=overflow-block>overflow-block</a>, and <a class=property data-link-type=propdesc href=#descdef-overflow-inline title=overflow-inline>overflow-inline</a> media features were added.
19441944

19451945
<li>
19461946
<span class=css data-link-type=maybe title=or>or</span>, <span class=css data-link-type=maybe title=and>and</span>, <a class=css data-link-type=maybe href=#valuedef-only title=only>only</a> and <a class=css data-link-type=maybe href=#valuedef-not title=not>not</a> are disallowed from being recognized as media types,
@@ -2160,7 +2160,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
21602160
<li>value for @media/overflow-inline, <a href=#valuedef-none2 title="section 5.6">5.6</a>
21612161
<li>value for @media/pointer, <a href=#valuedef-none3 title="section 7.1">7.1</a>
21622162
<li>value for @media/hover, <a href=#valuedef-none4 title="section 7.2">7.2</a>
2163-
<li>value for @media/script, <a href=#valuedef-none title="section 9.1">9.1</a>
2163+
<li>value for @media/scripting, <a href=#valuedef-none title="section 9.1">9.1</a>
21642164
</ul><li>normal<ul><li>value for @media/updates, <a href=#valuedef-normal0 title="section 5.4">5.4</a>
21652165
<li>value for @media/light-level, <a href=#valuedef-normal title="section 8.1">8.1</a>
21662166
</ul><li>not, <a href=#valuedef-not title="section 2.2.1">2.2.1</a>
@@ -2179,7 +2179,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
21792179
<li>resolution, <a href=#descdef-resolution title="section 5.1">5.1</a>
21802180
<li>scan, <a href=#descdef-scan title="section 5.2">5.2</a>
21812181
<li>screen, <a href=#valuedef-screen title="section 2.3">2.3</a>
2182-
<li>script, <a href=#descdef-script title="section 9.1">9.1</a>
2182+
<li>scripting, <a href=#descdef-scripting title="section 9.1">9.1</a>
21832183
<li>scroll<ul><li>value for @media/overflow-block, <a href=#valuedef-scroll0 title="section 5.5">5.5</a>
21842184
<li>value for @media/overflow-inline, <a href=#valuedef-scroll title="section 5.6">5.6</a>
21852185
</ul><li>slow, <a href=#valuedef-slow title="section 5.4">5.4</a>
@@ -2213,7 +2213,7 @@ <h2 class="no-num no-ref heading settled heading" id=property-index><span class=
22132213
<tr><th scope-row=""><a data-property="">pointer</a><td>none | coarse | fine<td><td>discrete
22142214
<tr><th scope-row=""><a data-property="">hover</a><td>none | on-demand | over<td><td>discrete
22152215
<tr><th scope-row=""><a data-property="">light-level</a><td>dim | normal | washed<td><td>discrete
2216-
<tr><th scope-row=""><a data-property="">script</a><td>none | enabled<td><td>discrete</table></div>
2216+
<tr><th scope-row=""><a data-property="">scripting</a><td>none | enabled<td><td>discrete</table></div>
22172217

22182218

22192219
<h2 class="no-num heading settled" id=issues-index><span class=content>Issues Index</span><a class=self-link href=#issues-index></a></h2><div style="counter-reset: issue"><div class=issue>

mediaqueries/Overview.src.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ <h4 id='mq-ranges'>
435435
Every media feature defines its “type” as either “range” or “discrete” in its definition table.
436436

437437
“Discrete” media features,
438-
like 'light-level' or 'script',
438+
like 'light-level' or 'scripting',
439439
take their values from a set.
440440
The values may be keywords
441441
or boolean numbers (0 and 1),
@@ -484,12 +484,12 @@ <h4 id='mq-boolean-context'>
484484
<div class='example'>
485485
Some <a>media features</a> are designed to be written like this.
486486

487-
For example, 'script' is typically written as ''(script)'' to test if scripting is enabled,
488-
or ''not (script)'' to see if it's disabled.
487+
For example, 'scripting' is typically written as ''(scripting)'' to test if scripting is enabled,
488+
or ''not (scripting)'' to see if it's disabled.
489489

490490
It can still be given an explicit value as well,
491-
with ''(script: enabled)'' equal to ''(script)'',
492-
and ''(script: none)'' equal to ''not (script)''.
491+
with ''(scripting: enabled)'' equal to ''(scripting)'',
492+
and ''(scripting: none)'' equal to ''not (scripting)''.
493493
</div>
494494

495495
<div class='example'>
@@ -1525,23 +1525,23 @@ <h3 id="light-level">
15251525

15261526

15271527

1528-
<h2 id='mf-script'>
1528+
<h2 id='mf-scripting'>
15291529
Scripting Media Features</h2>
15301530

1531-
<h3 id="script">
1532-
script</h3>
1531+
<h3 id="scripting">
1532+
scripting</h3>
15331533

15341534
<pre class='descdef mq'>
1535-
Name: script
1535+
Name: scripting
15361536
Value: none | enabled
15371537
For: @media
15381538
Type: discrete
15391539
</pre>
15401540

1541-
The 'script' media feature is used to query whether ECMAscript is supported
1541+
The 'scripting' media feature is used to query whether ECMAscript is supported
15421542
on the current document.
15431543

1544-
<dl dfn-type=value dfn-for="@media/script">
1544+
<dl dfn-type=value dfn-for="@media/scripting">
15451545
<dt><dfn>enabled</dfn>
15461546
<dd>
15471547
Indicates that the user agent supports ECMAscript
@@ -1556,10 +1556,10 @@ <h3 id="script">
15561556

15571557
Some user agents have the ability to turn off ECMAscript support on a per script basis or per domain basis,
15581558
allowing some, but not all, scripts to run in a particular document.
1559-
The 'script' media feature does not allow fine grained detection of which script is allowed to run.
1560-
In this scenario, the value of the 'script' media feature should be ''script/enabled''
1559+
The 'scripting' media feature does not allow fine grained detection of which script is allowed to run.
1560+
In this scenario, the value of the 'scripting' media feature should be ''scripting/enabled''
15611561
if scripts originating on the same domain as the document are allowed to run,
1562-
and ''script/none'' otherwise.
1562+
and ''scripting/none'' otherwise.
15631563

15641564
Note: A future level of CSS may extend this media feature to allow fine-grained detection of which script is allowed to run.
15651565

@@ -1632,7 +1632,7 @@ <h3 id="changes-2012">
16321632
<a>Media features</a> with numeric values can now be written in a <a href="mq-range-context">range context</a>.
16331633

16341634
<li>
1635-
The 'script', 'pointer', 'hover', 'light-level', 'updates', 'overflow-block', and 'overflow-inline' media features were added.
1635+
The 'scripting', 'pointer', 'hover', 'light-level', 'updates', 'overflow-block', and 'overflow-inline' media features were added.
16361636

16371637
<li>
16381638
''or'', ''and'', ''only'' and ''not'' are disallowed from being recognized as media types,

0 commit comments

Comments
 (0)