marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-12-03 02:54:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/knsv/mermaid

Browse Source 
Conflicts:
	gulpfile.js
This commit is contained in:
knsv
2014-12-11 19:35:03 +01:00
parent 0955305076 fcfbce8a97
commit 92439fbdf3
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/graphDb.js
View File

@@ -55,7 +55,8 @@ exports.addVertex = function (id, text, type, style) {
exports.addLink = function (start, end, type, linktext) {
//console.log('Got edge', start, end);
var edge = {start: start, end: end, type: undefined, text: ''};
var linktext = type.text;
linktext = type.text;
if (typeof linktext !== 'undefined') {
edge.text = linktext;
}
@@ -204,4 +205,3 @@ exports.clear = function () {
exports.defaultStyle = function () {
return "fill:#ffa;stroke: #f66; stroke-width: 3px; stroke-dasharray: 5, 5;fill:#ffa;stroke: #666;";
};

2
src/utils.js
View File

@@ -24,4 +24,4 @@ module.exports.detectType = function(text,a){
}
return "graph";
}
};