Skip to content

Commit 15f589e

Browse files
committed
Building without firefox in the karma tests
1 parent 464b7e8 commit 15f589e

File tree

5 files changed

+21
-74
lines changed

5 files changed

+21
-74
lines changed

dist/dagre.js

+16-5
Original file line numberDiff line numberDiff line change
@@ -1309,14 +1309,23 @@ module.exports = order;
13091309
* 1. Graph nodes will have an "order" attribute based on the results of the
13101310
* algorithm.
13111311
*/
1312-
function order(g) {
1312+
function order(g, opts) {
1313+
if (opts && typeof opts.customOrder === 'function') {
1314+
opts.customOrder(g, order);
1315+
return;
1316+
}
1317+
13131318
let maxRank = util.maxRank(g),
13141319
downLayerGraphs = buildLayerGraphs(g, util.range(1, maxRank + 1), "inEdges"),
13151320
upLayerGraphs = buildLayerGraphs(g, util.range(maxRank - 1, -1, -1), "outEdges");
13161321

13171322
let layering = initOrder(g);
13181323
assignOrder(g, layering);
13191324

1325+
if (opts && opts.disableOptimalOrderHeuristic) {
1326+
return;
1327+
}
1328+
13201329
let bestCC = Number.POSITIVE_INFINITY,
13211330
best;
13221331

@@ -1810,7 +1819,8 @@ function findType1Conflicts(g, layering) {
18101819
return layer;
18111820
}
18121821

1813-
layering.reduce(visitLayer);
1822+
layering.length && layering.reduce(visitLayer);
1823+
18141824
return conflicts;
18151825
}
18161826

@@ -1855,7 +1865,8 @@ function findType2Conflicts(g, layering) {
18551865
return south;
18561866
}
18571867

1858-
layering.reduce(visitLayer);
1868+
layering.length && layering.reduce(visitLayer);
1869+
18591870
return conflicts;
18601871
}
18611872

@@ -2948,7 +2959,7 @@ function zipObject(props, values) {
29482959
}
29492960

29502961
},{"@dagrejs/graphlib":29}],28:[function(require,module,exports){
2951-
module.exports = "1.0.4";
2962+
module.exports = "1.1.1";
29522963

29532964
},{}],29:[function(require,module,exports){
29542965
/**
@@ -4342,7 +4353,7 @@ function read(json) {
43424353
}
43434354

43444355
},{"./graph":44}],47:[function(require,module,exports){
4345-
module.exports = '2.1.13';
4356+
module.exports = '2.2.1';
43464357

43474358
},{}]},{},[1])(1)
43484359
});

dist/dagre.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ module.exports = function(config) {
5858

5959
// start these browsers
6060
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
61-
browsers: ['Chrome', 'Firefox'],
61+
browsers: ['Chrome'],
6262

6363

6464
// Continuous Integration mode

package-lock.json

-63
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
"jshint-stylish": "2.2.1",
3636
"karma": "6.4.1",
3737
"karma-chrome-launcher": "3.1.1",
38-
"karma-firefox-launcher": "2.1.2",
3938
"karma-mocha": "2.0.1",
4039
"karma-requirejs": "1.1.0",
4140
"karma-safari-launcher": "1.0.0",

0 commit comments

Comments
 (0)