marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-10-06 07:39:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for issue #175

Browse Source
This commit is contained in:
knsv
2015-06-16 10:40:08 +02:00
parent 342b83a010
commit e5a701d04d
12 changed files with 324 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
dist/mermaid.js vendored
View File

@@ -26197,15 +26197,25 @@ exports.draw = function (text, id,isDot) {
te.style('text-anchor', 'middle');
te.text('Title for cluster');
*/
// Center the graph
svg.attr("height", g.graph().height );
if(typeof conf.width === 'undefined'){
svg.attr("width", g.graph().width );
}else{
svg.attr("width", conf.width );
if(conf.useMaxWidth) {
// Center the graph
svg.attr("height", '100%');
svg.attr("width", '100%');
//svg.attr("viewBox", svgb.getBBox().x + ' 0 '+ g.graph().width+' '+ g.graph().height);
svg.attr("viewBox", '0 0 ' + (g.graph().width + 20) + ' ' + (g.graph().height + 20));
svg.attr('style', 'max-width:' + (g.graph().width + 20) + 'px;');
}
//svg.attr("viewBox", svgb.getBBox().x + ' 0 '+ g.graph().width+' '+ g.graph().height);
svg.attr("viewBox", '0 0 ' + (g.graph().width+20) + ' ' + (g.graph().height+20));
else{
// Center the graph
svg.attr("height", g.graph().height );
if(typeof conf.width === 'undefined'){
svg.attr("width", g.graph().width );
}else{
svg.attr("width", conf.width );
}
//svg.attr("viewBox", svgb.getBBox().x + ' 0 '+ g.graph().width+' '+ g.graph().height);
svg.attr("viewBox", '0 0 ' + (g.graph().width+20) + ' ' + (g.graph().height+20)); }
// Index nodes
graph.indexNodes('sunGraph'+i);
@@ -28508,7 +28518,10 @@ module.exports.draw = function (text, id) {
gantt.yy.clear();
gantt.parse(text);
var elem = document.getElementById(id);
w = elem.offsetWidth;
w = elem.parentElement.offsetWidth;
console.log('id='+id,' w='+w);
console.log(elem.parentElement);
if (typeof w === 'undefined') {
w = 1200;
@@ -30802,9 +30815,14 @@ module.exports.draw = function (text, id) {
}
var width = box.stopx-box.startx+2*conf.diagramMarginX;
diagram.attr("height",height);
diagram.attr("width", width );
if(conf.useMaxWidth) {
diagram.attr("height", '100%');
diagram.attr("width", '100%');
diagram.attr('style', 'max-width:' + (width) + 'px;')
}else{
diagram.attr("height",height);
diagram.attr("width", width );
}
diagram.attr("viewBox", (box.startx-conf.diagramMarginX) + ' -' +conf.diagramMarginY + ' ' + width + ' ' + height);
};
@@ -31118,7 +31136,7 @@ var init = function () {
txt = he.decode(txt).trim();
mermaidAPI.render(id,txt,insertSvg);
mermaidAPI.render(id,txt,insertSvg, element);
}
};
@@ -31246,7 +31264,8 @@ var config = {
flowchart:{
// Default is to not set width
// width: 1200
htmlLabels:true
htmlLabels:true,
useMaxWidth:true
},
sequenceDiagram:{
diagramMarginX:50,
@@ -31268,7 +31287,8 @@ var config = {
mirrorActors:true,
// Depending on css styling this might need adjustment
// Prolongs the edge of the diagram downwards
bottomMarginAdj:1
bottomMarginAdj:1,
useMaxWidth:true
},
gantt:{
titleTopMargin: 25,
@@ -31354,19 +31374,27 @@ exports.version = function(){
return require('../package.json').version;
};
var render = function(id, txt,cb){
var render = function(id, txt, cb, container){
d3.select('body').append('div')
.attr('id', 'd'+id)
.append('svg')
.attr('id', id)
.attr('width','100%')
.attr('xmlns','http://www.w3.org/2000/svg')
.append('g');
if(typeof container !== 'undefined'){
d3.select(container).append('div')
.attr('id', 'd'+id)
.append('svg')
.attr('id', id)
.attr('width','100%')
.attr('xmlns','http://www.w3.org/2000/svg')
.append('g');
}
else{
d3.select('body').append('div')
.attr('id', 'd'+id)
.append('svg')
.attr('id', id)
.attr('width','100%')
.attr('xmlns','http://www.w3.org/2000/svg')
.append('g');
}
//console.log(d3.select('#d'+id).node().innerHTML);
var element = d3.select('#d'+id).node();
var graphType = utils.detectType(txt);
var classes = {};
@@ -31411,21 +31439,24 @@ var render = function(id, txt,cb){
}
break;
}
//console.log(document.body.innerHTML);
cb(d3.select('#d'+id).node().innerHTML);
if(typeof d3.select('#d'+id).node().remove === 'function'){
if(typeof cb !== 'undefined'){
cb(d3.select('#d'+id).node().innerHTML);
}
var node = d3.select('#d'+id).node();
if(node !== null && typeof node.remove === 'function'){
d3.select('#d'+id).node().remove();
}
};
exports.render = function(id, text,cb){
exports.render = function(id, text, cb, containerElement){
if(typeof document === 'undefined'){
// Todo handle rendering serverside using phantomjs
}
else{
// In browser
render( id, text, cb);
render( id, text, cb, containerElement);
}
};