Fix for issue #174

mermaid-js · Jun 14, 2015 · 342b83a · 342b83a
1 parent eb555f7
commit 342b83a
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 57 deletions.
diff --git a/dist/mermaid.js b/dist/mermaid.js
@@ -24999,6 +24999,7 @@ module.exports={
  "gulp-concat": "~2.4.1",
  "gulp-data": "^1.1.1",
  "gulp-ext-replace": "~0.1.0",
+ "gulp-filelog": "^0.4.1",
  "gulp-hogan": "^1.1.0",
  "gulp-insert": "^0.4.0",
  "gulp-istanbul": "^0.4.0",
@@ -26381,6 +26382,7 @@ exports.setClass = function (id,className) {
  }
  }
 };
+var clickEvents = [];
 /**
  * Called by parser when a graph definition is found, stores the direction of the chart.
  * @param dir
@@ -26407,7 +26409,6 @@ exports.setClickEvent = function (id,functionName) {
  funs.push(function(){
  var elem = document.getElementById(id);
  if(elem !== null){
- //console.log('id was NOT null: '+id);
  elem.onclick = function(){eval(functionName+'(\'' + id + '\')');}; // jshint ignore:line
  }
  else{
@@ -26421,12 +26422,9 @@ exports.setClickEvent = function (id,functionName) {
 };
 
 exports.bindFunctions = function(){
- //setTimeout(function(){
- funs.forEach(function(fun){
- fun();
- });
- //},1000);
-
+ funs.forEach(function(fun){
+ fun();
+ });
 };
 exports.getDirection = function () {
  return direction;
@@ -26462,7 +26460,7 @@ exports.clear = function () {
  vertices = {};
  classes = {};
  edges = [];
- funs = [];
+ //funs = [];
  subGraphs = [];
  subCount = 0;
 };
@@ -26528,7 +26526,6 @@ var indexNodes = function (id, pos) {
  }
  //var nPos = getPosForId(subGraphs[pos].id);
  posCrossRef[secCount]=pos;
- console.log('Setting ',' ',secCount,' to ',pos);
  // Check if match
  if(subGraphs[pos].id === id){
  return {

diff --git a/dist/mermaid.min.js b/dist/mermaid.min.js
diff --git a/dist/mermaid.slim.js b/dist/mermaid.slim.js
@@ -15783,6 +15783,7 @@ module.exports={
  "gulp-concat": "~2.4.1",
  "gulp-data": "^1.1.1",
  "gulp-ext-replace": "~0.1.0",
+ "gulp-filelog": "^0.4.1",
  "gulp-hogan": "^1.1.0",
  "gulp-insert": "^0.4.0",
  "gulp-istanbul": "^0.4.0",
@@ -17165,6 +17166,7 @@ exports.setClass = function (id,className) {
  }
  }
 };
+var clickEvents = [];
 /**
  * Called by parser when a graph definition is found, stores the direction of the chart.
  * @param dir
@@ -17191,7 +17193,6 @@ exports.setClickEvent = function (id,functionName) {
  funs.push(function(){
  var elem = document.getElementById(id);
  if(elem !== null){
- //console.log('id was NOT null: '+id);
  elem.onclick = function(){eval(functionName+'(\'' + id + '\')');}; // jshint ignore:line
  }
  else{
@@ -17205,12 +17206,9 @@ exports.setClickEvent = function (id,functionName) {
 };
 
 exports.bindFunctions = function(){
- //setTimeout(function(){
- funs.forEach(function(fun){
- fun();
- });
- //},1000);
-
+ funs.forEach(function(fun){
+ fun();
+ });
 };
 exports.getDirection = function () {
  return direction;
@@ -17246,7 +17244,7 @@ exports.clear = function () {
  vertices = {};
  classes = {};
  edges = [];
- funs = [];
+ //funs = [];
  subGraphs = [];
  subCount = 0;
 };
@@ -17312,7 +17310,6 @@ var indexNodes = function (id, pos) {
  }
  //var nPos = getPosForId(subGraphs[pos].id);
  posCrossRef[secCount]=pos;
- console.log('Setting ',' ',secCount,' to ',pos);
  // Check if match
  if(subGraphs[pos].id === id){
  return {

diff --git a/dist/mermaid.slim.min.js b/dist/mermaid.slim.min.js
diff --git a/dist/mermaidAPI.js b/dist/mermaidAPI.js
@@ -24666,6 +24666,7 @@ module.exports={
  "gulp-concat": "~2.4.1",
  "gulp-data": "^1.1.1",
  "gulp-ext-replace": "~0.1.0",
+ "gulp-filelog": "^0.4.1",
  "gulp-hogan": "^1.1.0",
  "gulp-insert": "^0.4.0",
  "gulp-istanbul": "^0.4.0",
@@ -26048,6 +26049,7 @@ exports.setClass = function (id,className) {
  }
  }
 };
+var clickEvents = [];
 /**
  * Called by parser when a graph definition is found, stores the direction of the chart.
  * @param dir
@@ -26074,7 +26076,6 @@ exports.setClickEvent = function (id,functionName) {
  funs.push(function(){
  var elem = document.getElementById(id);
  if(elem !== null){
- //console.log('id was NOT null: '+id);
  elem.onclick = function(){eval(functionName+'(\'' + id + '\')');}; // jshint ignore:line
  }
  else{
@@ -26088,12 +26089,9 @@ exports.setClickEvent = function (id,functionName) {
 };
 
 exports.bindFunctions = function(){
- //setTimeout(function(){
- funs.forEach(function(fun){
- fun();
- });
- //},1000);
-
+ funs.forEach(function(fun){
+ fun();
+ });
 };
 exports.getDirection = function () {
  return direction;
@@ -26129,7 +26127,7 @@ exports.clear = function () {
  vertices = {};
  classes = {};
  edges = [];
- funs = [];
+ //funs = [];
  subGraphs = [];
  subCount = 0;
 };
@@ -26195,7 +26193,6 @@ var indexNodes = function (id, pos) {
  }
  //var nPos = getPosForId(subGraphs[pos].id);
  posCrossRef[secCount]=pos;
- console.log('Setting ',' ',secCount,' to ',pos);
  // Check if match
  if(subGraphs[pos].id === id){
  return {

diff --git a/dist/mermaidAPI.slim.js b/dist/mermaidAPI.slim.js
diff --git a/dist/mermaidAPI.slim.min.js b/dist/mermaidAPI.slim.min.js
diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js
@@ -136,6 +136,7 @@ exports.setClass = function (id,className) {
  }
  }
 };
+var clickEvents = [];
 /**
  * Called by parser when a graph definition is found, stores the direction of the chart.
  * @param dir
@@ -162,7 +163,6 @@ exports.setClickEvent = function (id,functionName) {
  funs.push(function(){
  var elem = document.getElementById(id);
  if(elem !== null){
- //console.log('id was NOT null: '+id);
  elem.onclick = function(){eval(functionName+'(\'' + id + '\')');}; // jshint ignore:line
  }
  else{
@@ -176,12 +176,9 @@ exports.setClickEvent = function (id,functionName) {
 };
 
 exports.bindFunctions = function(){
- //setTimeout(function(){
- funs.forEach(function(fun){
- fun();
- });
- //},1000);
-
+ funs.forEach(function(fun){
+ fun();
+ });
 };
 exports.getDirection = function () {
  return direction;
@@ -217,7 +214,7 @@ exports.clear = function () {
  vertices = {};
  classes = {};
  edges = [];
- funs = [];
+ //funs = [];
  subGraphs = [];
  subCount = 0;
 };
@@ -283,7 +280,6 @@ var indexNodes = function (id, pos) {
  }
  //var nPos = getPosForId(subGraphs[pos].id);
  posCrossRef[secCount]=pos;
- console.log('Setting ',' ',secCount,' to ',pos);
  // Check if match
  if(subGraphs[pos].id === id){
  return {

diff --git a/test/gantt.html b/test/gantt.html
@@ -22,7 +22,7 @@
  numberSectionStyles:3,
  axisFormatter: [
  // Within a day
- ["%I:%M", function (d) {
+ ["X%I:%M", function (d) {
  return d.getHours();
  }],
  // Monday a week
@@ -43,6 +43,42 @@
  }]
  ]
  };
+ mermaid.initialize({
+ sequenceDiagram:{"diagramMarginX":50,"diagramMarginY":10,"actorMargin":50,"width":150,"height":45,"boxMargin":10,"boxTextMargin":5,"noteMargin":10,"messageMargin":35, "mirrorActors":false},
+ gantt: {
+ titleTopMargin:25,
+ barHeight:20,
+ barGap:4,
+ topPadding:50,
+ sidePadding:75,
+ gridLineStartPadding:35,
+ fontSize:11,
+ numberSectionStyles:3,
+ axisFormatter: [
+ // Within a day
+ ["X%I:%M", function (d) {
+ return d.getHours();
+ }],
+ // Monday a week
+ ["w. %U", function (d) {
+ return d.getDay() == 1;
+ }],
+ // Day within a week (not monday)
+ ["%a %d", function (d) {
+ return d.getDay() && d.getDate() != 1;
+ }],
+ // within a month
+ ["%b %d", function (d) {
+ return d.getDate() != 1;
+ }],
+ // Month
+ ["%m-%y", function (d) {
+ return d.getMonth();
+ }]
+ ]
+ }
+
+ })
  </script>
 
 </head>

diff --git a/test/web.html b/test/web.html
@@ -13,8 +13,8 @@
  mermaid.flowchartConfig = {width:'100%'};
  </script>
  <script>
- function apa(){
- console.log('CLICKED');
+ function coolAction(){
+ console.log('Got callback in user defiend function');
  }
  </script>
  <style>
@@ -37,11 +37,12 @@ <h1>Issue 141</h1>
  %% Example diagram
  A[Square Rect] -- Link text --> B((Circle))
  A --> C(Round Rect)
+ click A coolAction
  B --> D{Rhombus}
  C --> D
  A("test(vcc) a a ") --> B;
 
-
+ 
  </div>
  <h1>Issue 140</h1>
  <div class="mermaid" id="i140">