Fix relatwed to issue number #54 - % in text

2015-01-24 19:33:10 +01:00 · 2015-01-24 19:33:10 +01:00 · 6612b3e01e
parent d0428d492b
commit 6612b3e01e
14 changed files with 135 additions and 38 deletions
--- a/dist/mermaid.full.js
+++ b/dist/mermaid.full.js
--- a/dist/mermaid.full.min.js
+++ b/dist/mermaid.full.min.js
--- a/dist/mermaid.slim.js
+++ b/dist/mermaid.slim.js
--- a/dist/mermaid.slim.min.js
+++ b/dist/mermaid.slim.min.js
--- a/src/diagrams/example/example.spec.js
+++ b/src/diagrams/example/example.spec.js
@ -9,7 +9,7 @@ describe('when parsing an info graph it',function() {
        parseError = function(err, hash) {
            console.log('Syntax error:' + err);
        };
-        ex.yy.parseError = parseError;
+        //ex.yy.parseError = parseError;
    });

    it('should handle an info definition', function () {
@ -22,4 +22,15 @@ describe('when parsing an info graph it',function() {

        ex.parse(str);
    });
+
+    it('should handle an showMessage statement definition', function () {
+        var str = 'info\nshowInfo';
+
+        try{
+            ex.parse(str);
+        }
+        catch(err){
+            console.log('Caught'+err.message);
+        }
+    });
 });
--- a/src/diagrams/example/exampleDb.js
+++ b/src/diagrams/example/exampleDb.js
@ -21,3 +21,6 @@ exports.getInfo = function(){
    return info;
 };

+exports.parseError = function(err,hash){
+    mermaid.parseError(err,hash);
+};
--- a/src/diagrams/flowchart/flowRenderer.js
+++ b/src/diagrams/flowchart/flowRenderer.js
@ -188,7 +188,11 @@ exports.getClasses = function (text, isDot) {
    parser.yy = graph;

    // Parse the graph definition
-    parser.parse(text);
+    try{
+        parser.parse(text);
+    }
+    catch(err){
+    }

    var classDefStylesObj = {};
    var classDefStyleStr = '';
@ -222,7 +226,13 @@ exports.draw = function (text, id,isDot) {
    parser.yy = graph;

    // Parse the graph definition
-    parser.parse(text);
+    try{
+
+        parser.parse(text);
+    }
+    catch(err){
+
+    }

    // Fetch the default direction, use TD if none was found
    var dir;
@ -417,4 +427,5 @@ exports.draw = function (text, id,isDot) {
            i = i + 1;
        });
    },200);
-};
+};
+
--- a/src/diagrams/flowchart/graphDb.js
+++ b/src/diagrams/flowchart/graphDb.js
@ -235,3 +235,7 @@ exports.addSubGraph = function (list, title) {
 exports.getSubGraphs = function (list) {
    return subGraphs;
 };
+
+exports.parseError = function(err,hash){
+    mermaid.parseError(err,hash);
+};
--- a/src/diagrams/flowchart/parser/flow.jison
+++ b/src/diagrams/flowchart/parser/flow.jison
@ -389,7 +389,7 @@ styleComponent: ALPHA | COLON | MINUS | NUM | UNIT | SPACE | HEX | BRKT | DOT |

 commentToken   : textToken | graphCodeTokens ;

-textToken      : textNoTagsToken | TAGSTART | TAGEND | '=='  | '--' ;
+textToken      : textNoTagsToken | TAGSTART | TAGEND | '=='  | '--' | PCT ;

 textNoTagsToken: alphaNumToken | SPACE | MINUS | keywords ;

--- a/src/diagrams/flowchart/parser/flow.js
+++ b/src/diagrams/flowchart/parser/flow.js
--- a/src/diagrams/sequenceDiagram/sequenceDb.js
+++ b/src/diagrams/sequenceDiagram/sequenceDb.js
@ -77,8 +77,8 @@ exports.addNote = function (actor, placement, message){
 };


-exports.parseError = function(err, hash) {
-    console.log('Syntax error:' + err);
+exports.parseError = function(err,hash){
+    mermaid.parseError(err,hash);
 };

 exports.apply = function(param){
--- a/src/diagrams/sequenceDiagram/sequenceRenderer.js
+++ b/src/diagrams/sequenceDiagram/sequenceRenderer.js
@ -246,7 +246,12 @@ module.exports.setConf = function(cnf){
 module.exports.draw = function (text, id) {
    sq.yy.clear();
    //console.log(text);
-    sq.parse(text+'\n');
+    try{
+        sq.parse(text+'\n');
+    }
+    catch(err){
+
+    }
    exports.bounds.init();
    var diagram = d3.select('#'+id);

--- a/src/main.js
+++ b/src/main.js
@ -112,6 +112,10 @@ global.mermaid = {
    },
    getParser:function(){
        return flow.parser;
+    },
+    parseError:function(err,hash){
+        console.log('Mermaid Syntax error:');
+        console.log(err);
    }
 };

--- a/test/web.html
+++ b/test/web.html
@ -27,6 +27,13 @@
    <link rel="stylesheet" href="seq.css"/>
 </head>
    <body>
+    <h1>Issue </h1>
+    <div class="mermaid">
+        graph TD
+        question1{Gas tank less than 1/8?}
+        action1[Fill tank to 100%]
+        question1-- Yes -->action1
+    </div>
    <h1>Shapes</h1>
    <div class="mermaid">
    graph TD;