Skip to content

Commit 24b2261

Browse files
committed
[mediaqueries] Do not allow the <media-query> production to match the empty string, reverting an unintentional change from MQ3
1 parent 44b9b9d commit 24b2261

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

mediaqueries/Overview.bs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,8 +690,10 @@ Syntax</h2>
690690
Note: This explicit definition of <<media-query-list>> parsing
691691
is necessary to make the error-recovery behavior of <a>media query lists</a> well-defined.
692692

693+
Note: This definition of <<media-query-list>> parsing intentionally accepts an empty list.
694+
693695
<pre>
694-
<dfn>&lt;media-query></dfn> = <<media-condition>>?
696+
<dfn>&lt;media-query></dfn> = <<media-condition>>
695697
| [ not | only ]? <<media-type>> [ and <<media-condition>> ]?
696698
<dfn>&lt;media-type></dfn> = <<ident>>
697699

mediaqueries/Overview.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</p>
6161
<h1 class="p-name no-ref" id=title>Media Queries Level 4</h1>
6262
<h2 class="no-num no-toc no-ref heading settled" id=subtitle><span class=content>Editor’s Draft,
63-
<span class=dt-updated><span class=value-title title=20140913>13 September 2014</span></span></span></h2>
63+
<span class=dt-updated><span class=value-title title=20141001>1 October 2014</span></span></span></h2>
6464
<div data-fill-with=spec-metadata><dl>
6565
<dt>This version:
6666
<dd><a class=u-url href=http://dev.w3.org/csswg/mediaqueries4/>http://dev.w3.org/csswg/mediaqueries4/</a>
@@ -1157,7 +1157,9 @@ <h2 class="heading settled" data-level=3 id=mq-syntax><span class=secno>3 </span
11571157
<p class=note>Note: This explicit definition of <a class="production css" data-link-type=type href=#typedef-media-query-list title="<media-query-list>">&lt;media-query-list&gt;</a> parsing
11581158
is necessary to make the error-recovery behavior of <a data-link-type=dfn href=#media-query-list title="media query lists">media query lists</a> well-defined.</p>
11591159

1160-
<pre><dfn class=css data-dfn-type=type data-export="" id=typedef-media-query>&lt;media-query&gt;<a class=self-link href=#typedef-media-query></a></dfn> = <a class="production css" data-link-type=type href=#typedef-media-condition title="<media-condition>">&lt;media-condition&gt;</a>?
1160+
<p class=note>Note: This definition of <a class="production css" data-link-type=type href=#typedef-media-query-list title="<media-query-list>">&lt;media-query-list&gt;</a> parsing intentionally accepts an empty list.</p>
1161+
1162+
<pre><dfn class=css data-dfn-type=type data-export="" id=typedef-media-query>&lt;media-query&gt;<a class=self-link href=#typedef-media-query></a></dfn> = <a class="production css" data-link-type=type href=#typedef-media-condition title="<media-condition>">&lt;media-condition&gt;</a>
11611163
| [ not | only ]? <a class="production css" data-link-type=type href=#typedef-media-type title="<media-type>">&lt;media-type&gt;</a> [ and <a class="production css" data-link-type=type href=#typedef-media-condition title="<media-condition>">&lt;media-condition&gt;</a> ]?
11621164
<dfn class=css data-dfn-type=type data-export="" id=typedef-media-type>&lt;media-type&gt;<a class=self-link href=#typedef-media-type></a></dfn> = <a class="production css" data-link-type=type href=#typedef-ident title="<ident>">&lt;ident&gt;</a>
11631165
<dfn class=css data-dfn-type=type data-export="" id=typedef-media-condition>&lt;media-condition&gt;<a class=self-link href=#typedef-media-condition></a></dfn> = <a class="production css" data-link-type=type href=#typedef-media-not title="<media-not>">&lt;media-not&gt;</a> | <a class="production css" data-link-type=type href=#typedef-media-and title="<media-and>">&lt;media-and&gt;</a> | <a class="production css" data-link-type=type href=#typedef-media-or title="<media-or>">&lt;media-or&gt;</a> | <a class="production css" data-link-type=type href=#typedef-media-in-parens title="<media-in-parens>">&lt;media-in-parens&gt;</a>

0 commit comments

Comments
 (0)