Require d3 directly to better support Node usage

This commit is contained in:
Mark Dalgleish
2015-01-20 16:54:22 +11:00
parent 48500652b3
commit 50d285bc49
8 changed files with 18730 additions and 1235 deletions

15
src/diagrams/sequenceDiagram/d3.js vendored Normal file
View File

@@ -0,0 +1,15 @@
/* global window */
var d3;
if (require) {
try {
d3 = require("d3");
} catch (e) {}
}
if (!d3) {
d3 = window.d3;
}
module.exports = d3;

View File

@@ -1,8 +1,16 @@
/**
* Created by knut on 14-11-18.
*/
var proxyquire = require('proxyquire');
var newD3;
var d3 = {
select:function(){
return new newD3();
}
};
var sq = require('./parser/sequenceDiagram').parser;
var sd = require('./sequenceRenderer');
var sd = proxyquire('./sequenceRenderer', { './d3': d3 });
var str;
describe('when parsing a sequenceDiagram',function() {
@@ -480,7 +488,7 @@ describe('when rendering a sequenceDiagram',function() {
};
sq.yy.parseError = parseError;
function newD3() {
newD3 = function() {
var o = {
append: function (type) {
return newD3();
@@ -508,16 +516,8 @@ describe('when rendering a sequenceDiagram',function() {
};
return o;
}
var _d3 = {
select:function(){
return new newD3();
}
};
d3 = _d3;
conf = {
diagramMarginX:50,
diagramMarginY:10,

View File

@@ -1,4 +1,3 @@
/* globals d3 */
/**
* Created by knut on 14-11-23.
*/
@@ -6,6 +5,7 @@
var sq = require('./parser/sequenceDiagram').parser;
sq.yy = require('./sequenceDb');
var svgDraw = require('./svgDraw');
var d3 = require('./d3');
var conf = {
diagramMarginX:50,