Cleanup after merge
This commit is contained in:
parent
9f970ed953
commit
a23fce6c2d
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -60,7 +60,6 @@ exports.addVertices = function (vert, g) {
|
||||||
verticeText = vertice.text;
|
verticeText = vertice.text;
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
var labelTypeStr = '';
|
var labelTypeStr = '';
|
||||||
if(equals('html',mermaid_config.labelType)) {
|
if(equals('html',mermaid_config.labelType)) {
|
||||||
labelTypeStr = 'html';
|
labelTypeStr = 'html';
|
||||||
|
@ -68,9 +67,6 @@ exports.addVertices = function (vert, g) {
|
||||||
verticeText = verticeText.replace(/<br>/g, "\n");
|
verticeText = verticeText.replace(/<br>/g, "\n");
|
||||||
labelTypeStr = 'text';
|
labelTypeStr = 'text';
|
||||||
}
|
}
|
||||||
=======
|
|
||||||
console.log(verticeText);
|
|
||||||
>>>>>>> master
|
|
||||||
|
|
||||||
var radious = 0;
|
var radious = 0;
|
||||||
var _shape = '';
|
var _shape = '';
|
||||||
|
@ -159,11 +155,8 @@ exports.addEdges = function (edges, g) {
|
||||||
else {
|
else {
|
||||||
var edgeText = edge.text.replace(/<br>/g, "\n");
|
var edgeText = edge.text.replace(/<br>/g, "\n");
|
||||||
if(typeof edge.style === 'undefined'){
|
if(typeof edge.style === 'undefined'){
|
||||||
<<<<<<< HEAD
|
//g.setEdge(edge.start, edge.end,{labelType: "text", style: "stroke: #333; stroke-width: 1.5px;fill:none", labelpos:'c', label: edgeText, arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
|
||||||
g.setEdge(edge.start, edge.end,{labelType: "text", style: "stroke: #333; stroke-width: 1.5px;fill:none", labelpos:'c', label: edgeText, arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
|
|
||||||
=======
|
|
||||||
g.setEdge(edge.start, edge.end,{labelType: "html",style: style, labelpos:'c', label: '<span style="background:#e8e8e8">'+edge.text+'</span>', arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
|
g.setEdge(edge.start, edge.end,{labelType: "html",style: style, labelpos:'c', label: '<span style="background:#e8e8e8">'+edge.text+'</span>', arrowheadStyle: "fill: #333", arrowhead: aHead},cnt);
|
||||||
>>>>>>> master
|
|
||||||
}else{
|
}else{
|
||||||
g.setEdge(edge.start, edge.end, {
|
g.setEdge(edge.start, edge.end, {
|
||||||
labelType: "text",style: style, arrowheadStyle: "fill: #333", label: edgeText, arrowhead: aHead
|
labelType: "text",style: style, arrowheadStyle: "fill: #333", label: edgeText, arrowhead: aHead
|
||||||
|
|
|
@ -108,11 +108,11 @@ var equals = function (val, variable){
|
||||||
|
|
||||||
var mermaid_config_exists = function() {
|
var mermaid_config_exists = function() {
|
||||||
return (typeof mermaid_config !== 'undefined');
|
return (typeof mermaid_config !== 'undefined');
|
||||||
}
|
};
|
||||||
|
|
||||||
var mermaid_config_item_exists = function(item) {
|
var mermaid_config_item_exists = function(item) {
|
||||||
return mermaid_config_exists() && (typeof mermaid_config[item] !== 'undefined');
|
return mermaid_config_exists() && (typeof mermaid_config[item] !== 'undefined');
|
||||||
}
|
};
|
||||||
|
|
||||||
module.exports.config = {};
|
module.exports.config = {};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue