Skip to content

Commit

Permalink
Merge branch 'develop' into gh-pages
Browse files Browse the repository at this point in the history
* develop:
  v12.2.3
  chore(package): update deps
  fix(core/webidl): pre eats its own CSS classes (closes #1247)
  • Loading branch information
marcoscaceres committed Jun 1, 2017
2 parents 6170091 + 40826b1 commit 03042c3
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
2 changes: 1 addition & 1 deletion builds/respec-w3c-common.build.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion builds/respec-w3c-common.js

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "respec",
"version": "12.2.2",
"version": "12.2.3",
"license": "W3C",
"description": "A technical specification pre-processor.",
"engines": {
Expand All @@ -19,8 +19,8 @@
"babel-plugin-transform-async-to-generator": "^6.24.1",
"babel-plugin-transform-es2015-modules-amd": "^6.24.1",
"babel-preset-env": "^1.5.1",
"chai": "^4.0.0",
"clipboard": "^1.6.1",
"chai": "^4.0.1",
"clipboard": "^1.7.1",
"domReady": "github:requirejs/domReady",
"glob": "^7.1.2",
"handlebars": "^4.0.10",
Expand Down Expand Up @@ -48,8 +48,8 @@
"moment": "^2.18.1",
"requirejs": "^2.3.3",
"text": "github:requirejs/text",
"uglify-es": "^3.0.12",
"webidl2": "^3.0.1",
"uglify-es": "^3.0.14",
"webidl2": "^3.0.2",
"whatwg-fetch": "^2.0.3"
},
"scripts": {
Expand All @@ -76,19 +76,19 @@
},
"dependencies": {
"colors": "^1.1.2",
"command-line-args": "^4.0.5",
"command-line-args": "^4.0.6",
"command-line-usage": "^4.0.0",
"epipebomb": "^1.0.0",
"express": "^4.15.3",
"fs-extra": "^3.0.1",
"highlight.js": "github:marcoscaceres/highlight.js",
"hyperhtml": "^0.11.6",
"hyperhtml": "^0.11.7",
"loading-indicator": "^2.0.0",
"marcosc-async": "^4.0.3",
"marked": "^0.3.6",
"nightmare": "^2.10.0",
"prompt": "^1.0.0",
"snyk": "^1.31.0"
"snyk": "^1.32.0"
},
"snyk": true
}
1 change: 1 addition & 0 deletions src/core/webidl.js
Original file line number Diff line number Diff line change
Expand Up @@ -1220,6 +1220,7 @@ export function run(conf, doc, cb) {
conf.definitionMap[title].push(elem);
});
$(this).replaceWith($df);
$df[0].classList.add(...this.classList);
});
doc.normalize();
finish();
Expand Down
5 changes: 5 additions & 0 deletions tests/spec/core/webidl-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -657,4 +657,9 @@ describe("Core - WebIDL", function() {
$section.find("#without-link-for a:contains('Documented')").attr("href")
).toEqual("#idl-def-documented");
});
it("retains css classes afer processing", () => {
const elem = doc.getElementById("retain-css-classes");
const expected = ["a", "b", "c", "overlarge"];
expect(expected.every(item => elem.classList.contains(item))).toBe(true);
});
});
5 changes: 5 additions & 0 deletions tests/spec/core/webidl.html
Original file line number Diff line number Diff line change
Expand Up @@ -536,5 +536,10 @@ <h2>Documentation</h2>
which broke links to it without [link-for].
</p>
</section>
<section>
<pre id='retain-css-classes' class='idl a b c overlarge'>
interface NotTested {};
</pre>
</section>
</body>
</html>

0 comments on commit 03042c3

Please sign in to comment.