Optimized a bit for left support adrai#26

adrai · adrai · commit 15a20072a2a2 · 2014-08-04T15:56:00.000+02:00
diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "flowchart",
-  "version": "1.3.1",
-  "main": "./release/flowchart-1.3.1.min.js",
+  "version": "1.3.2",
+  "main": "./release/flowchart-1.3.2.min.js",
   "dependencies": {},
   "ignore": [
     "src/",
diff --git a/releasenotes.md b/releasenotes.md
@@ -1,3 +1,7 @@
+### v1.3.2
+
+- Optimized a bit for left support [#26](https://github.com/adrai/flowchart.js/issues/26)
+
 ### v1.3.1
 
 - Added support for css class [#24](https://github.com/adrai/flowchart.js/pull/24)
diff --git a/site b/site
@@ -1 +1 @@
-Subproject commit 0aed541db4c97fcd53fe37c05a3dc2d598dec8ad
+Subproject commit 39020a4608e3f2fa11371e1a5298615749b2ef74
diff --git a/src/flowchart.chart.js b/src/flowchart.chart.js
@@ -69,8 +69,8 @@ FlowChart.prototype.render = function() {
 
   for (i = 0, len = this.symbols.length; i < len; i++) {
     symbol = this.symbols[i];
-    symbol.shiftX(this.options.x + (maxWidth - symbol.width)/2);
-    symbol.shiftY(this.options.y + (maxHeight - symbol.height)/2);
+    symbol.shiftX(this.options.x + (maxWidth - symbol.width)/2 + this.options['line-width']);
+    symbol.shiftY(this.options.y + (maxHeight - symbol.height)/2 + this.options['line-width']);
   }
 
   this.start.render();
diff --git a/src/flowchart.symbol.js b/src/flowchart.symbol.js
@@ -342,6 +342,20 @@ Symbol.prototype.drawLineTo = function(symbol, text, origin) {
     this.bottomStart = true;
     symbol.topEnd = true;
     maxX = bottom.x + lineLength/2;
+  } else if ((origin === 'left') && isOnSameColumn && isUpper) {
+    var diffX = left.x - lineLength/2;
+    if (symbolLeft.x < left.x) {
+      diffX = symbolLeft.x - lineLength/2;
+    }
+    line = drawLine(this.chart, left, [
+      {x: diffX, y: left.y},
+      {x: diffX, y: symbolTop.y - lineLength/2},
+      {x: symbolTop.x, y: symbolTop.y - lineLength/2},
+      {x: symbolTop.x, y: symbolTop.y}
+    ], text);
+    this.leftStart = true;
+    symbol.topEnd = true;
+    maxX = left.x;
   } else if ((origin === 'left')) {
     line = drawLine(this.chart, left, [
       {x: symbolTop.x + (left.x - symbolTop.x)/ 2, y: left.y},

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ FlowChart.prototype.render = function() {`
`69`	`69`
`70`	`70`	`for (i = 0, len = this.symbols.length; i < len; i++) {`
`71`	`71`	`symbol = this.symbols[i];`
`72`		`- symbol.shiftX(this.options.x + (maxWidth - symbol.width)/2);`
`73`		`- symbol.shiftY(this.options.y + (maxHeight - symbol.height)/2);`
	`72`	`+ symbol.shiftX(this.options.x + (maxWidth - symbol.width)/2 + this.options['line-width']);`
	`73`	`+ symbol.shiftY(this.options.y + (maxHeight - symbol.height)/2 + this.options['line-width']);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`this.start.render();`