GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

New release

Browse Source
This commit is contained in:
knsv 2015-01-11 15:02:35 +01:00
parent 27687fc742
commit 911cd09dd8
11 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mermaid", "name": "mermaid",
"version": "0.3.1", "version": "0.3.2",
"authors": [ "authors": [
"knsv <knut@sveido.com>" "knsv <knut@sveido.com>"
], ],

7
dist/mermaid.full.js vendored
View File

@ -13001,7 +13001,7 @@ process.chdir = function (dir) {
},{}],102:[function(require,module,exports){ },{}],102:[function(require,module,exports){
module.exports={ module.exports={
"name": "mermaid", "name": "mermaid",
"version": "0.3.1", "version": "0.3.2",
"description": "Markdownish syntax for generating flowcharts", "description": "Markdownish syntax for generating flowcharts",
"main": "src/main.js", "main": "src/main.js",
"bin": { "bin": {
@ -13142,6 +13142,8 @@ exports.addVertices = function (vert, g) {
verticeText = vertice.text; verticeText = vertice.text;
} }
console.log(verticeText);
var radious = 0; var radious = 0;
var _shape = ''; var _shape = '';
@ -13700,6 +13702,7 @@ exports.addSubGraph = function (list, title) {
var subG = []; var subG = [];
subG = uniq(subG.concat.apply(subG,list)); subG = uniq(subG.concat.apply(subG,list));
//console.log(subG);
subGraphs.push({nodes:subG,title:title}); subGraphs.push({nodes:subG,title:title});
}; };
@ -14576,7 +14579,7 @@ case 36:
yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]]; yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]];
break; break;
case 37: case 37:
this.$ = 'yo'; this.$ = [$$[$0]];
break; break;
case 38: case 38:
this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square'); this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square');

6
dist/mermaid.full.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
dist/mermaid.slim.js vendored
View File

@ -12969,7 +12969,7 @@ process.chdir = function (dir) {
},{}],102:[function(require,module,exports){ },{}],102:[function(require,module,exports){
module.exports={ module.exports={
"name": "mermaid", "name": "mermaid",
"version": "0.3.1", "version": "0.3.2",
"description": "Markdownish syntax for generating flowcharts", "description": "Markdownish syntax for generating flowcharts",
"main": "src/main.js", "main": "src/main.js",
"bin": { "bin": {
@ -13110,6 +13110,8 @@ exports.addVertices = function (vert, g) {
verticeText = vertice.text; verticeText = vertice.text;
} }
console.log(verticeText);
var radious = 0; var radious = 0;
var _shape = ''; var _shape = '';
@ -13668,6 +13670,7 @@ exports.addSubGraph = function (list, title) {
var subG = []; var subG = [];
subG = uniq(subG.concat.apply(subG,list)); subG = uniq(subG.concat.apply(subG,list));
//console.log(subG);
subGraphs.push({nodes:subG,title:title}); subGraphs.push({nodes:subG,title:title});
}; };
@ -14544,7 +14547,7 @@ case 36:
yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]]; yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]];
break; break;
case 37: case 37:
this.$ = 'yo'; this.$ = [$$[$0]];
break; break;
case 38: case 38:
this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square'); this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square');

6
dist/mermaid.slim.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "mermaid", "name": "mermaid",
"version": "0.3.1", "version": "0.3.2",
"description": "Markdownish syntax for generating flowcharts", "description": "Markdownish syntax for generating flowcharts",
"main": "src/main.js", "main": "src/main.js",
"bin": { "bin": {

2
src/diagrams/flowchart/flowRenderer.js
View File

@ -60,6 +60,8 @@ exports.addVertices = function (vert, g) {
verticeText = vertice.text; verticeText = vertice.text;
} }
console.log(verticeText);
var radious = 0; var radious = 0;
var _shape = ''; var _shape = '';

1
src/diagrams/flowchart/graphDb.js
View File

@ -228,6 +228,7 @@ exports.addSubGraph = function (list, title) {
var subG = []; var subG = [];
subG = uniq(subG.concat.apply(subG,list)); subG = uniq(subG.concat.apply(subG,list));
//console.log(subG);
subGraphs.push({nodes:subG,title:title}); subGraphs.push({nodes:subG,title:title});
}; };

2
src/diagrams/flowchart/parser/flow.jison
View File

@ -220,7 +220,7 @@ verticeStatement:
vertex link vertex vertex link vertex
{ yy.addLink($1,$3,$2);$$ = [$1,$3];} { yy.addLink($1,$3,$2);$$ = [$1,$3];}
| vertex | vertex
{$$ = 'yo';} {$$ = [$1];}
; ;
vertex: alphaNum SQS text SQE vertex: alphaNum SQS text SQE

2
src/diagrams/flowchart/parser/flow.js
View File

@ -127,7 +127,7 @@ case 36:
yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]]; yy.addLink($$[$0-2],$$[$0],$$[$0-1]);this.$ = [$$[$0-2],$$[$0]];
break; break;
case 37: case 37:
this.$ = 'yo'; this.$ = [$$[$0]];
break; break;
case 38: case 38:
this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square'); this.$ = $$[$0-3];yy.addVertex($$[$0-3],$$[$0-1],'square');

26
test/web.html
View File

@ -39,7 +39,29 @@
class green B; class green B;
</div> </div>
<h1>Sub graphs</h1> <h1>Sub graphs</h1>
<div class="mermaid">graph TB <div class="mermaid">graph LR
subgraph old sys 1
a1(new client)-->b1(sys1 server)
oc1(Old client)-->b2
end
subgraph old sys 2
a2(new client)-->b2(sys2 server)
oc2(Old client)-->b2
end
subgraph old sys 3
a3(new client)-->b3(sys3 server)
end
subgraph New sys
a1
a2
a3
end
</div>
<div class="mermaid2">graph TB
subgraph one subgraph one
a1-->a2 a1-->a2
end end
@ -52,7 +74,7 @@
c1-->a2 c1-->a2
</div> </div>
<div class="mermaid">graph TB <div class="mermaid2">graph TB
subgraph subgraph
sq[Square shape] -.-> ci((Circle shape)) sq[Square shape] -.-> ci((Circle shape))
od>Odd shape]-. Two line<br>edge comment .-> ro od>Odd shape]-. Two line<br>edge comment .-> ro