Skip to content

Commit fa448b7

Browse files
committed
Merge pull request mathjax#151 from mathjax/node5
Handle jsdom update in either node4 or node5 directory layout
2 parents 93ae1a8 + 8acefd3 commit fa448b7

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

lib/patch/jsdom.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
1+
//
2+
// We need to load cssstyle's parsers.js, but its location differs
3+
// between node 4 and node 5, so check which one we have.
4+
//
5+
6+
var fs = require('fs');
7+
8+
var PARSERS = 'jsdom/node_modules/cssstyle/lib/parsers.js'; // node 4 hierarchy
9+
try {fs.accessSync(PARSERS, fs.F_OK)} catch (e) {
10+
PARSERS = 'cssstyle/lib/parsers.js'; // node 5 heirarchy
11+
}
12+
113
//
214
// Patch for CSSStyleDeclaration padding property so that it sets/clears
315
// the Top, Right, Bottom, and Left properties (and also validates the
416
// padding value)
517
//
618
var PADDING = (function () {
7-
var parsers = require('jsdom/node_modules/cssstyle/lib/parsers.js');
19+
var parsers = require(PARSERS);
820
var TYPES = parsers.TYPES;
921

1022
var isValid = function (v) {
@@ -51,7 +63,7 @@ var PADDING = (function () {
5163
// margin value)
5264
//
5365
var MARGIN = (function () {
54-
var parsers = require('jsdom/node_modules/cssstyle/lib/parsers.js');
66+
var parsers = require(PARSERS);
5567
var TYPES = parsers.TYPES;
5668

5769
var isValid = function (v) {

0 commit comments

Comments
 (0)