Skip to content

Commit

Permalink
Merge branch 'develop' into gh-pages
Browse files Browse the repository at this point in the history
* develop:
  v5.0.1
  chore(beautify): snyk security patches
  chore(package): update snyk to version 1.19.1 (#926)
  chore(package): update snyk to version 1.18.1 (#922)
  chore(package): update karma-chrome-launcher to version 2.0.0 (#920)
  fix(release): stylelizeCommits match any case
  chore(CHANGELOG): update changelog
  • Loading branch information
marcoscaceres committed Sep 1, 2016
2 parents 9263c41 + 48e5995 commit bda8c77
Show file tree
Hide file tree
Showing 9 changed files with 389 additions and 235 deletions.
41 changes: 34 additions & 7 deletions CHANGELOG.md
@@ -1,16 +1,43 @@
# Change Log

## [Unreleased](https://github.com/w3c/respec/tree/HEAD)
## [v5.0.0](https://github.com/w3c/respec/tree/v5.0.0) (2016-08-16)
[Full Changelog](https://github.com/w3c/respec/compare/v4.4.5...v5.0.0)

[Full Changelog](https://github.com/w3c/respec/compare/v4.4.2...HEAD)
**Closed issues:**

- CG specs should not require a mailing list [\#918](https://github.com/w3c/respec/issues/918)
- Remove dead code [\#801](https://github.com/w3c/respec/issues/801)

**Merged pull requests:**

- refactor\(utils\): ownerSwapper only takes Nodes \(close \#801\) [\#917](https://github.com/w3c/respec/pull/917) ([marcoscaceres](https://github.com/marcoscaceres))

## [v4.4.5](https://github.com/w3c/respec/tree/v4.4.5) (2016-08-12)
[Full Changelog](https://github.com/w3c/respec/compare/v4.4.4...v4.4.5)

**Closed issues:**

- Drop promise poly [\#751](https://github.com/w3c/respec/issues/751)

**Merged pull requests:**

- feat: remove promise polyfill \(close \#751\) [\#916](https://github.com/w3c/respec/pull/916) ([marcoscaceres](https://github.com/marcoscaceres))

## [v4.4.4](https://github.com/w3c/respec/tree/v4.4.4) (2016-08-12)
[Full Changelog](https://github.com/w3c/respec/compare/v4.4.3...v4.4.4)

## [v4.4.3](https://github.com/w3c/respec/tree/v4.4.3) (2016-08-12)
[Full Changelog](https://github.com/w3c/respec/compare/v4.4.2...v4.4.3)

**Fixed bugs:**

- define where vocabulary in webidl should link [\#910](https://github.com/w3c/respec/issues/910)

**Closed issues:**

- https not used for patent links [\#914](https://github.com/w3c/respec/issues/914)
- support `data-for` attribute for WebIDL [\#863](https://github.com/w3c/respec/issues/863)
- Need WebIDL docs [\#847](https://github.com/w3c/respec/issues/847)
- Include lodash [\#747](https://github.com/w3c/respec/issues/747)

## [v4.4.2](https://github.com/w3c/respec/tree/v4.4.2) (2016-08-10)
Expand Down Expand Up @@ -1840,7 +1867,7 @@
- If abstract and SotD are in the wrong order, strange things happen [\#37](https://github.com/w3c/respec/issues/37)

## [v3.1.2](https://github.com/w3c/respec/tree/v3.1.2) (2012-06-19)
[Full Changelog](https://github.com/w3c/respec/compare/v3.3.1...v3.1.2)
[Full Changelog](https://github.com/w3c/respec/compare/v3.1.1...v3.1.2)

**Implemented enhancements:**

Expand All @@ -1854,11 +1881,11 @@

- Add ref for: WEBAPPS-MANIFEST-API [\#41](https://github.com/w3c/respec/pull/41) ([tobie](https://github.com/tobie))

## [v3.3.1](https://github.com/w3c/respec/tree/v3.3.1) (2012-06-18)
[Full Changelog](https://github.com/w3c/respec/compare/v3.1.1...v3.3.1)

## [v3.1.1](https://github.com/w3c/respec/tree/v3.1.1) (2012-06-18)
[Full Changelog](https://github.com/w3c/respec/compare/v3.1.0...v3.1.1)
[Full Changelog](https://github.com/w3c/respec/compare/v3.3.1...v3.1.1)

## [v3.3.1](https://github.com/w3c/respec/tree/v3.3.1) (2012-06-18)
[Full Changelog](https://github.com/w3c/respec/compare/v3.1.0...v3.3.1)

**Fixed bugs:**

Expand Down
2 changes: 1 addition & 1 deletion builds/respec-w3c-common.build.js.map

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions builds/respec-w3c-common.js

Large diffs are not rendered by default.

23 changes: 18 additions & 5 deletions js/deps/beautify-css.js
Expand Up @@ -74,7 +74,8 @@
var selectorSeparatorNewline = (options.selector_separator_newline === undefined) ? true : options.selector_separator_newline;
var end_with_newline = (options.end_with_newline === undefined) ? false : options.end_with_newline;
var newline_between_rules = (options.newline_between_rules === undefined) ? true : options.newline_between_rules;
var spaceAroundSelectorSeparator = (options.space_around_selector_separator === undefined) ? false : options.space_around_selector_separator;
var space_around_combinator = (options.space_around_combinator === undefined) ? false : options.space_around_combinator;
space_around_combinator = space_around_combinator || ((options.space_around_selector_separator === undefined) ? false : options.space_around_selector_separator);
var eol = options.eol ? options.eol : '\n';

// compatibility
Expand Down Expand Up @@ -372,7 +373,8 @@
} else if (ch === ":") {
eatWhitespace();
if ((insideRule || enteringConditionalGroup) &&
!(lookBack("&") || foundNestedPseudoClass())) {
!(lookBack("&") || foundNestedPseudoClass()) &&
!lookBack("(")) {
// 'property: value' delimiter
// which could be in a conditional group query
insidePropertyValue = true;
Expand All @@ -381,6 +383,11 @@
} else {
// sass/less parent reference don't use a space
// sass nested pseudo-class don't use a space

// preserve space before pseudoclasses/pseudoelements, as it means "in any child"
if (lookBack(" ") && output[output.length - 1] !== " ") {
output.push(" ");
}
if (peek() === ":") {
// pseudo-element
next();
Expand Down Expand Up @@ -425,14 +432,20 @@
} else {
print.singleSpace();
}
} else if (ch === '>' || ch === '+' || ch === '~') {
//handl selector separator spacing
if (spaceAroundSelectorSeparator && !insidePropertyValue && parenLevel < 1) {
} else if ((ch === '>' || ch === '+' || ch === '~') &&
!insidePropertyValue && parenLevel < 1) {
//handle combinator spacing
if (space_around_combinator) {
print.singleSpace();
output.push(ch);
print.singleSpace();
} else {
output.push(ch);
eatWhitespace();
// squash extra whitespace
if (ch && whiteRe.test(ch)) {
ch = '';
}
}
} else if (ch === ']') {
output.push(ch);
Expand Down
18 changes: 14 additions & 4 deletions js/deps/beautify-html.js
Expand Up @@ -89,6 +89,8 @@

var multi_parser,
indent_inner_html,
indent_body_inner_html,
indent_head_inner_html,
indent_size,
indent_character,
wrap_line_length,
Expand All @@ -112,6 +114,8 @@
}

indent_inner_html = (options.indent_inner_html === undefined) ? false : options.indent_inner_html;
indent_body_inner_html = (options.indent_body_inner_html === undefined) ? true : options.indent_body_inner_html;
indent_head_inner_html = (options.indent_head_inner_html === undefined) ? true : options.indent_head_inner_html;
indent_size = (options.indent_size === undefined) ? 4 : parseInt(options.indent_size, 10);
indent_character = (options.indent_char === undefined) ? ' ' : options.indent_char;
brace_style = (options.brace_style === undefined) ? 'collapse' : options.brace_style;
Expand All @@ -127,7 +131,6 @@
// prexisting - not sure of full effect of removing, leaving in
'acronym', 'address', 'big', 'dt', 'ins', 'small', 'strike', 'tt',
'pre',
'h1', 'h2', 'h3', 'h4', 'h5', 'h6'
];
preserve_newlines = (options.preserve_newlines === undefined) ? true : options.preserve_newlines;
max_preserve_newlines = preserve_newlines ?
Expand Down Expand Up @@ -163,6 +166,8 @@
this.token_text = this.last_token = this.last_text = this.token_type = '';
this.newlines = 0;
this.indent_content = indent_inner_html;
this.indent_body_inner_html = indent_body_inner_html;
this.indent_head_inner_html = indent_head_inner_html;

this.Utils = { //Uilities made available to the various functions
whitespace: "\n\r\t ".split(''),
Expand Down Expand Up @@ -499,7 +504,7 @@
} else if (tag_check === 'script' &&
(tag_complete.search('type') === -1 ||
(tag_complete.search('type') > -1 &&
tag_complete.search(/\b(text|application)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json)/) > -1))) {
tag_complete.search(/\b(text|application|dojo)\/(x-)?(javascript|ecmascript|jscript|livescript|(ld\+)?json|method|aspect)/) > -1))) {
if (!peek) {
this.record_tag(tag_check);
this.tag_type = 'SCRIPT';
Expand Down Expand Up @@ -847,7 +852,12 @@
multi_parser.print_newline(false, multi_parser.output);
multi_parser.print_token(multi_parser.token_text);
if (multi_parser.indent_content) {
multi_parser.indent();
if ((multi_parser.indent_body_inner_html || !multi_parser.token_text.match(/<body(?:.*)>/)) &&
(multi_parser.indent_head_inner_html || !multi_parser.token_text.match(/<head(?:.*)>/))) {

multi_parser.indent();
}

multi_parser.indent_content = false;
}
multi_parser.current_mode = 'CONTENT';
Expand All @@ -861,7 +871,7 @@
case 'TK_TAG_END':
//Print new line only if the tag has no content and has child
if (multi_parser.last_token === 'TK_CONTENT' && multi_parser.last_text === '') {
var tag_name = multi_parser.token_text.match(/\w+/)[0];
var tag_name = (multi_parser.token_text.match(/\w+/) || [])[0];
var tag_extracted_from_last_output = null;
if (multi_parser.output.length) {
tag_extracted_from_last_output = multi_parser.output[multi_parser.output.length - 1].match(/(?:<|{{#)\s*(\w+)/);
Expand Down

0 comments on commit bda8c77

Please sign in to comment.