marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-27 11:19:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	dist/mermaid.js
This commit is contained in:
knsv
2016-03-12 11:24:22 +01:00
parent 2c90034d39 6c621f243d
commit 325d0dd075
17 changed files with 6732 additions and 4219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison
View File

@@ -44,7 +44,7 @@
"sequenceDiagram" return 'SD';
"," return ',';
";" return 'NL';
[^\->:\n,;]+ return 'ACTOR';
[^\->:\n,;]+ { yytext = yytext.trim(); return 'ACTOR'; }
"->>" return 'SOLID_ARROW';
"-->>" return 'DOTTED_ARROW';
"->" return 'SOLID_OPEN_ARROW';
@@ -64,7 +64,9 @@
%% /* language grammar */
start
: SD document { yy.apply($2);return $2; }
: SPACE start
| NL start
| SD document { yy.apply($2);return $2; }
;
document

4
src/diagrams/sequenceDiagram/svgDraw.js
View File

@@ -151,8 +151,8 @@ exports.drawLoop = function(elem,bounds,labelText, conf){
txt.text = labelText;
txt.x = bounds.startx;
txt.y = bounds.starty;
txt.labelMargin = 1.5 * conf.boxMargin;
txt.class = 'labelText';
txt.labelMargin = 1.5 * 10; // This is the small box that says "loop"
txt.class = 'labelText'; // Its size & position are fixed.
txt.fill = 'white';
exports.drawLabel(g,txt);

3
src/mermaid.js
View File

@@ -67,8 +67,7 @@ var init = function () {
nodes = nodes === undefined ? document.querySelectorAll('.mermaid')
: typeof nodes === 'string' ? document.querySelectorAll(nodes)
: nodes instanceof Node ? [nodes]
/*! Last case - sequence config was passed pick next */
: nodes;
: nodes; // Last case - sequence config was passed pick next
var i;