Skip to content

Commit

Permalink
Building without firefox in the karma tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rustedgrail committed Mar 15, 2024
1 parent 464b7e8 commit 15f589e
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 74 deletions.
21 changes: 16 additions & 5 deletions dist/dagre.js
Original file line number Diff line number Diff line change
Expand Up @@ -1309,14 +1309,23 @@ module.exports = order;
* 1. Graph nodes will have an "order" attribute based on the results of the
* algorithm.
*/
function order(g) {
function order(g, opts) {
if (opts && typeof opts.customOrder === 'function') {
opts.customOrder(g, order);
return;
}

let maxRank = util.maxRank(g),
downLayerGraphs = buildLayerGraphs(g, util.range(1, maxRank + 1), "inEdges"),
upLayerGraphs = buildLayerGraphs(g, util.range(maxRank - 1, -1, -1), "outEdges");

let layering = initOrder(g);
assignOrder(g, layering);

if (opts && opts.disableOptimalOrderHeuristic) {
return;
}

let bestCC = Number.POSITIVE_INFINITY,
best;

Expand Down Expand Up @@ -1810,7 +1819,8 @@ function findType1Conflicts(g, layering) {
return layer;
}

layering.reduce(visitLayer);
layering.length && layering.reduce(visitLayer);

return conflicts;
}

Expand Down Expand Up @@ -1855,7 +1865,8 @@ function findType2Conflicts(g, layering) {
return south;
}

layering.reduce(visitLayer);
layering.length && layering.reduce(visitLayer);

return conflicts;
}

Expand Down Expand Up @@ -2948,7 +2959,7 @@ function zipObject(props, values) {
}

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

},{}],29:[function(require,module,exports){
/**
Expand Down Expand Up @@ -4342,7 +4353,7 @@ function read(json) {
}

},{"./graph":44}],47:[function(require,module,exports){
module.exports = '2.1.13';
module.exports = '2.2.1';

},{}]},{},[1])(1)
});
8 changes: 4 additions & 4 deletions dist/dagre.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module.exports = function(config) {

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


// Continuous Integration mode
Expand Down
63 changes: 0 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"jshint-stylish": "2.2.1",
"karma": "6.4.1",
"karma-chrome-launcher": "3.1.1",
"karma-firefox-launcher": "2.1.2",
"karma-mocha": "2.0.1",
"karma-requirejs": "1.1.0",
"karma-safari-launcher": "1.0.0",
Expand Down

0 comments on commit 15f589e

Please sign in to comment.