Fix for issue #46, slashes in text

mermaid-js · Dec 13, 2014 · 2859413 · 2859413
1 parent 7fc2a0a
commit 2859413
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 32 deletions.
diff --git a/dist/mermaid.full.js b/dist/mermaid.full.js
diff --git a/dist/mermaid.full.min.js b/dist/mermaid.full.min.js
diff --git a/dist/mermaid.slim.js b/dist/mermaid.slim.js
diff --git a/dist/mermaid.slim.min.js b/dist/mermaid.slim.min.js
diff --git a/src/diagrams/flowchart/parser/flow.jison b/src/diagrams/flowchart/parser/flow.jison
@@ -94,7 +94,7 @@
 [\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D]|
 [\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC]]|
 [\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF]|
-[\uFFD2-\uFFD7\uFFDA-\uFFDC_]
+[\uFFD2-\uFFD7\uFFDA-\uFFDC_\/]
  return 'ALPHA';
 "|" return 'PIPE';
 "(" return 'PS';

diff --git a/src/diagrams/flowchart/parser/flow.js b/src/diagrams/flowchart/parser/flow.js
diff --git a/src/diagrams/flowchart/parser/flow.spec.js b/src/diagrams/flowchart/parser/flow.spec.js
@@ -169,6 +169,17 @@ describe('when parsing ',function(){
 
  expect(edges[0].type).toBe('arrow_cross');
  });
+
+ it('should handle text on edges with space',function(){
+ var res = flow.parser.parse('graph TD;A--x|text with / should work|B;');
+
+ var vert = flow.parser.yy.getVertices();
+ var edges = flow.parser.yy.getEdges();
+
+
+ expect(edges[0].text).toBe('text with / should work');
+ });
+
  it('should handle text on edges with space CAPS',function(){
  var res = flow.parser.parse('graph TD;A--x|text including CAPS space|B;');