Skip to content

Commit b49e249

Browse files
committed
[css3-ui] drop explicit css21 border-* refs
1 parent 9150011 commit b49e249

2 files changed

Lines changed: 29 additions & 31 deletions

File tree

css-ui/Overview.bs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Abstract: This specification describes user interface related selectors,
2121
Deadline: 2012-02-14
2222
Link Defaults: css-color-3 (property) color
2323
Link Defaults: selectors-4 (selector) :indeterminate
24-
Link Defaults: css21 (property) border-width
25-
Link Defaults: css21 (property) border-style
2624
Ignored Terms: outline-top
2725
Ignored Terms: outline-left
2826
At Risk: ::value ::choices pseudo-elements

css-ui/Overview.html

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<script>self = (typeof window !== 'undefined')
6666
? window // if in browser
6767
: (
68-
(typeof WorkerGlobalScope !== 'undefined' &amp;&amp; self instanceof WorkerGlobalScope)
68+
(typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)
6969
? self // if in worker
7070
: {} // if in node js
7171
);
@@ -89,7 +89,7 @@
8989
} else if (_.util.type(tokens) === 'Array') {
9090
return tokens.map(_.util.encode);
9191
} else {
92-
return tokens.replace(/&amp;/g, '&amp;amp;').replace(/&lt;/g, '&amp;lt;').replace(/\u00a0/g, ' ');
92+
return tokens.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/\u00a0/g, ' ');
9393
}
9494
},
9595

@@ -187,7 +187,7 @@
187187

188188
var elements = document.querySelectorAll('pre[class*="language-"], [class*="language-"] pre, pre[class*="lang-"], [class*="lang-"] pre');
189189
for (var i=0, element; element = elements[i++];) {
190-
if (element.firstElementChild &amp;&amp; element.firstElementChild.tagName.toLowerCase() == "code") {
190+
if (element.firstElementChild && element.firstElementChild.tagName.toLowerCase() == "code") {
191191
// Already handled by the previous loop
192192
continue;
193193
}
@@ -203,7 +203,7 @@
203203
// Find language
204204
var language, grammar, parent = element;
205205

206-
while (parent &amp;&amp; !lang.test(parent.className)) {
206+
while (parent && !lang.test(parent.className)) {
207207
parent = parent.parentNode;
208208
}
209209

@@ -241,7 +241,7 @@
241241

242242
_.hooks.run('before-highlight', env);
243243

244-
if (async &amp;&amp; self.Worker) {
244+
if (async && self.Worker) {
245245
var worker = new Worker(_.filename);
246246

247247
worker.onmessage = function(evt) {
@@ -251,7 +251,7 @@
251251

252252
env.element.innerHTML = env.highlightedCode;
253253

254-
callback &amp;&amp; callback.call(env.element);
254+
callback && callback.call(env.element);
255255
_.hooks.run('after-highlight', env);
256256
};
257257

@@ -267,7 +267,7 @@
267267

268268
env.element.innerHTML = env.highlightedCode;
269269

270-
callback &amp;&amp; callback.call(element);
270+
callback && callback.call(element);
271271

272272
_.hooks.run('after-highlight', env);
273273
}
@@ -301,7 +301,7 @@
301301
var patterns = grammar[token];
302302
patterns = (_.util.type(patterns) === "Array") ? patterns : [patterns];
303303

304-
for (var j = 0; j &lt; patterns.length; ++j) {
304+
for (var j = 0; j < patterns.length; ++j) {
305305
var pattern = patterns[j],
306306
inside = pattern.inside,
307307
lookbehind = !!pattern.lookbehind,
@@ -310,7 +310,7 @@
310310

311311
pattern = pattern.pattern || pattern;
312312

313-
for (var i=0; i&lt;strarr.length; i++) { // Don’t cache length as it changes during the loop
313+
for (var i=0; i<strarr.length; i++) { // Don’t cache length as it changes during the loop
314314

315315
var str = strarr[i];
316316

@@ -431,7 +431,7 @@
431431
attributes += name + '="' + (env.attributes[name] || '') + '"';
432432
}
433433

434-
return '&lt;' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '&lt;/' + env.tag + '>';
434+
return '<' + env.tag + ' class="' + env.classes.join(' ') + '" ' + attributes + '>' + env.content + '</' + env.tag + '>';
435435

436436
};
437437

@@ -461,7 +461,7 @@
461461
if (script) {
462462
_.filename = script.src;
463463

464-
if (document.addEventListener &amp;&amp; !script.hasAttribute('data-manual')) {
464+
if (document.addEventListener && !script.hasAttribute('data-manual')) {
465465
document.addEventListener('DOMContentLoaded', _.highlightAll);
466466
}
467467
}
@@ -470,22 +470,22 @@
470470

471471
})();
472472

473-
if (typeof module !== 'undefined' &amp;&amp; module.exports) {
473+
if (typeof module !== 'undefined' && module.exports) {
474474
module.exports = Prism;
475475
}
476476
;
477477
Prism.languages.markup = {
478-
'comment': /&lt;!--[\w\W]*?-->/g,
479-
'prolog': /&lt;\?.+?\?>/,
480-
'doctype': /&lt;!DOCTYPE.+?>/,
481-
'cdata': /&lt;!\[CDATA\[[\w\W]*?]]>/i,
478+
'comment': /<!--[\w\W]*?-->/g,
479+
'prolog': /<\?.+?\?>/,
480+
'doctype': /<!DOCTYPE.+?>/,
481+
'cdata': /<!\[CDATA\[[\w\W]*?]]>/i,
482482
'tag': {
483-
pattern: /&lt;\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/gi,
483+
pattern: /<\/?[\w:-]+\s*(?:\s+[\w:-]+(?:=(?:("|')(\\?[\w\W])*?\1|[^\s'">=]+))?\s*)*\/?>/gi,
484484
inside: {
485485
'tag': {
486-
pattern: /^&lt;\/?[\w:-]+/i,
486+
pattern: /^<\/?[\w:-]+/i,
487487
inside: {
488-
'punctuation': /^&lt;\/?/,
488+
'punctuation': /^<\/?/,
489489
'namespace': /^[\w-]+?:/
490490
}
491491
},
@@ -505,14 +505,14 @@
505505

506506
}
507507
},
508-
'entity': /\&amp;#?[\da-z]{1,8};/gi
508+
'entity': /\&#?[\da-z]{1,8};/gi
509509
};
510510

511511
// Plugin to make entity title show the real entity, idea by Roman Komarov
512512
Prism.hooks.add('wrap', function(env) {
513513

514514
if (env.type === 'entity') {
515-
env.attributes['title'] = env.content.replace(/&amp;amp;/, '&amp;');
515+
env.attributes['title'] = env.content.replace(/&amp;/, '&');
516516
}
517517
});
518518
;
@@ -536,10 +536,10 @@
536536
if (Prism.languages.markup) {
537537
Prism.languages.insertBefore('markup', 'tag', {
538538
'style': {
539-
pattern: /&lt;style[\w\W]*?>[\w\W]*?&lt;\/style>/ig,
539+
pattern: /<style[\w\W]*?>[\w\W]*?<\/style>/ig,
540540
inside: {
541541
'tag': {
542-
pattern: /&lt;style[\w\W]*?>|&lt;\/style>/ig,
542+
pattern: /<style[\w\W]*?>|<\/style>/ig,
543543
inside: Prism.languages.markup.tag.inside
544544
},
545545
rest: Prism.languages.css
@@ -563,7 +563,7 @@
563563
'number': /[\d%\.]+/g
564564
});;
565565
</script>
566-
<style>/* http://prismjs.com/download.html?themes=prism&amp;languages=clike */
566+
<style>/* http://prismjs.com/download.html?themes=prism&languages=clike */
567567
/**
568568
* prism.js default theme for JavaScript, CSS and HTML
569569
* Based on dabblet (http://dabblet.com)
@@ -711,7 +711,7 @@
711711
<h1 class="p-name no-ref" id="title">CSS Basic User Interface Module Level 3 (CSS3 UI)</h1>
712712

713713
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft,
714-
<time class="dt-updated" datetime="2015-01-07">7 January 2015</time></span></h2>
714+
<time class="dt-updated" datetime="2015-01-12">12 January 2015</time></span></h2>
715715

716716
<div data-fill-with="spec-metadata">
717717
<dl>
@@ -1296,7 +1296,7 @@ <h3 class="heading settled" data-level="5.2" id="outline-width"><span class="sec
12961296

12971297
<tr>
12981298
<th>Value:</th>
1299-
<td><a class="production" data-link-type="propdesc" href="http://dev.w3.org/csswg/css2/box.html#propdef-border-width" title="border-width">&lt;‘border-width’></a></td></tr>
1299+
<td><a class="production" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-backgrounds-3/#border-width" title="border-width">&lt;‘border-width’></a></td></tr>
13001300

13011301

13021302
<tr>
@@ -1350,7 +1350,7 @@ <h3 class="heading settled" data-level="5.3" id="outline-style"><span class="sec
13501350

13511351
<tr>
13521352
<th>Value:</th>
1353-
<td>auto | <a class="production" data-link-type="propdesc" href="http://dev.w3.org/csswg/css2/box.html#propdef-border-style" title="border-style">&lt;‘border-style’></a></td></tr>
1353+
<td>auto | <a class="production" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-backgrounds-3/#border-style" title="border-style">&lt;‘border-style’></a></td></tr>
13541354

13551355

13561356
<tr>
@@ -1482,14 +1482,14 @@ <h3 class="heading settled" data-level="5.4" id="outline-color"><span class="sec
14821482

14831483
<p>The <a class="property" data-link-type="propdesc" href="#propdef-outline-width">outline-width</a> property accepts
14841484
the same values as
1485-
<a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css2/box.html#propdef-border-width">border-width</a>
1485+
<a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-backgrounds-3/#border-width">border-width</a>
14861486
(<a data-biblio-type="normative" data-link-type="biblio" href="#biblio-css3bg" title="CSS3BG">[CSS3BG]</a>,
14871487
<a href="http://www.w3.org/TR/css3-background/#the-border-width">Section 4.3</a>).</p>
14881488

14891489

14901490
<p>The <a class="property" data-link-type="propdesc" href="#propdef-outline-style">outline-style</a> property accepts
14911491
the same values as
1492-
<a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css2/box.html#propdef-border-style">border-style</a>
1492+
<a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-backgrounds-3/#border-style">border-style</a>
14931493
(<a data-biblio-type="normative" data-link-type="biblio" href="#biblio-css3bg" title="CSS3BG">[CSS3BG]</a>,
14941494
<a href="http://www.w3.org/TR/css3-background/#the-border-style">Section 4.2</a>),
14951495
except that

0 commit comments

Comments
 (0)