new version

Author: adrai

flowchart-latest.js

@@ -1,4 +1,4 @@
-// flowchart, v1.1.3
+// flowchart, v1.2.1
 // Copyright (c)2013 Adriano Raiano (adrai).
 // Distributed under MIT license
 // http://adrai.github.io/flowchart.js
@@ -83,7 +83,7 @@
   // global object or to jquery.
   if (typeof module !== 'undefined' && module.exports) {
      module.exports = flowchart;
-  } else {  
+  } else {
     root.flowchart = root.flowchart || flowchart;
   }
   // defaults
@@ -808,6 +808,32 @@
     options = options || {};
     Symbol.call(this, chart, options);
 
+    this.yes_direction = 'bottom';
+    this.no_direction = 'right';
+    if (options.yes && options.yes.direction && options.no && !options.no.direction) {
+      if (options.yes.direction === 'right') {
+        this.no_direction = 'bottom';
+        this.yes_direction = 'right';
+      } else {
+        this.no_direction = 'right';
+        this.yes_direction = 'bottom';
+      }
+    } else if (options.yes && !options.yes.direction && options.no && options.no.direction) {
+      if (options.no.direction === 'right') {
+        this.yes_direction = 'bottom';
+        this.no_direction = 'right';
+      } else {
+        this.yes_direction = 'right';
+        this.no_direction = 'bottom';
+      }
+    } else {
+      this.yes_direction = 'bottom';
+      this.no_direction = 'right';
+    }
+  
+    this.yes_direction = this.yes_direction || 'bottom';
+    this.no_direction = this.no_direction || 'right';
+  
     this.text.attr({
       x: chart.options['text-margin'] * 2
     });
@@ -854,27 +880,36 @@
   f.inherits(Condition, Symbol);
 
   Condition.prototype.render = function() {
-    if (this.yes_symbol) {
+  
+    if (this.yes_direction) {
+      this[this.yes_direction + '_symbol'] = this.yes_symbol;
+    }
+  
+    if (this.no_direction) {
+      this[this.no_direction + '_symbol'] = this.no_symbol;
+    }
+  
+    if (this.bottom_symbol) {
       var bottomPoint = this.getBottom();
-      var topPoint = this.yes_symbol.getTop();
+      var topPoint = this.bottom_symbol.getTop();
 
-      if (!this.yes_symbol.isPositioned) {
-        this.yes_symbol.shiftY(this.getY() + this.height + this.chart.options['line-length']);
-        this.yes_symbol.setX(bottomPoint.x - this.yes_symbol.width/2);
-        this.yes_symbol.isPositioned = true;
+      if (!this.bottom_symbol.isPositioned) {
+        this.bottom_symbol.shiftY(this.getY() + this.height + this.chart.options['line-length']);
+        this.bottom_symbol.setX(bottomPoint.x - this.bottom_symbol.width/2);
+        this.bottom_symbol.isPositioned = true;
 
-        this.yes_symbol.render();
+        this.bottom_symbol.render();
       }
     }
 
-    if (this.no_symbol) {
+    if (this.right_symbol) {
       var rightPoint = this.getRight();
-      var leftPoint = this.no_symbol.getLeft();
+      var leftPoint = this.right_symbol.getLeft();
 
-      if (!this.no_symbol.isPositioned) {
+      if (!this.right_symbol.isPositioned) {
 
-        this.no_symbol.setY(rightPoint.y - this.no_symbol.height/2);
-        this.no_symbol.shiftX(this.group.getBBox().x + this.width + this.chart.options['line-length']);
+        this.right_symbol.setY(rightPoint.y - this.right_symbol.height/2);
+        this.right_symbol.shiftX(this.group.getBBox().x + this.width + this.chart.options['line-length']);
 
         var self = this;
         (function shift() {
@@ -883,33 +918,33 @@
           for (var i = 0, len = self.chart.symbols.length; i < len; i++) {
             symb = self.chart.symbols[i];
 
-            var diff = Math.abs(symb.getCenter().x - self.no_symbol.getCenter().x);
-            if (symb.getCenter().y > self.no_symbol.getCenter().y && diff <= self.no_symbol.width/2) {
+            var diff = Math.abs(symb.getCenter().x - self.right_symbol.getCenter().x);
+            if (symb.getCenter().y > self.right_symbol.getCenter().y && diff <= self.right_symbol.width/2) {
               hasSymbolUnder = true;
               break;
             }
           }
 
           if (hasSymbolUnder) {
-            self.no_symbol.setX(symb.getX() + symb.width + self.chart.options['line-length']);
+            self.right_symbol.setX(symb.getX() + symb.width + self.chart.options['line-length']);
             shift();
           }
         })();
 
-        this.no_symbol.isPositioned = true;
+        this.right_symbol.isPositioned = true;
 
-        this.no_symbol.render();
+        this.right_symbol.render();
       }
     }
   };
 
   Condition.prototype.renderLines = function() {
     if (this.yes_symbol) {
-      this.drawLineTo(this.yes_symbol, this.chart.options['yes-text'], 'bottom');
+      this.drawLineTo(this.yes_symbol, this.chart.options['yes-text'], this.yes_direction);
     }
 
     if (this.no_symbol) {
-      this.drawLineTo(this.no_symbol, this.chart.options['no-text'], 'right');
+      this.drawLineTo(this.no_symbol, this.chart.options['no-text'], this.no_direction);
     }
   };
   function parse(input) {
@@ -1078,7 +1113,7 @@
 
         chart.symbols[symbol.key] = symbol;
 
-      } else if(line.indexOf('->') >= 0) {
+      } else if (line.indexOf('->') >= 0) {
         // flow
         var flowSymbols = line.split('->');
         for (var i = 0, lenS = flowSymbols.length; i < lenS; i++) {
@@ -1087,13 +1122,22 @@
           var realSymb = getSymbol(flowSymb);
           var next = getNextPath(flowSymb);
 
+          var direction;
+          if (next.indexOf(',') >= 0) {
+            var condOpt = next.split(',');
+            next = condOpt[0];
+            direction = condOpt[1].trim();
+          }
+  
           if (!chart.start) {
             chart.start = realSymb;
           }
 
           if (i + 1 < lenS) {
             var nextSymb = flowSymbols[i + 1];
             realSymb[next] = getSymbol(nextSymb);
+            realSymb[next].direction = direction;
+            direction = undefined;
           }
         }