From a30aab97ab8d6770500f854506485246ae143802 Mon Sep 17 00:00:00 2001
From: Christian Tzurcanu <christian.tzurcanu@gmail.com>
Date: Fri, 18 Sep 2015 16:36:38 +0300
Subject: [PATCH 1/3] included raphaela, small changes

---
 example/index.html      |  5 ++-
 raphaela.js             | 83 +++++++++++++++++++++++++++++++++++++++++
 src/flowchart.symbol.js | 22 +++++------
 3 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 raphaela.js

diff --git a/example/index.html b/example/index.html
index de9af51d..bd9aec50 100644
--- a/example/index.html
+++ b/example/index.html
@@ -6,9 +6,10 @@
         <style type="text/css">
           .end-element { background-color : #FFCCFF; }
         </style>
-        <script src="http://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>
+        <script src="../raphaela.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/svg.js/2.0.5/svg.js"></script>
         <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script src="http://flowchart.js.org/flowchart-latest.js"></script>
+        <script src="../bin/flowchart-latest.js"></script>
         <!--<script src="../bin/flowchart-latest.js"></script>-->
         <!--<script src="../release/flowchart-1.4.1.min.js"></script>-->
         <script>
diff --git a/raphaela.js b/raphaela.js
new file mode 100644
index 00000000..a586ad4f
--- /dev/null
+++ b/raphaela.js
@@ -0,0 +1,83 @@
+
+var Raphael = function(container, options){
+	this.paper = SVG(container)
+	this.registerFont = function(font){
+	//
+	return;
+}
+}
+
+Raphael.prototype.text = function(x, y, text){
+	console.log(x,y)
+	var text= this.paper.text(text)
+	//text.move(x,-text.height)
+	text.getBBox= function(){
+		return this.tbox()
+	}
+	return text
+}
+
+Raphael.prototype.rect = function(x, y, width, height, round){
+	var rect = this.paper.rect(width, height)//.move(x,y-10)
+	if (round) rect.radius(round)
+	rect.insertBefore = function(obj){
+		this.parent().add(obj)
+		this.back()
+	}
+	rect.getBBox= function(){
+		return this.tbox()
+	}
+	return rect
+}
+
+Raphael.prototype.set = function(){
+	var gr = this.paper.group()
+	gr.getBBox= function(){
+		var box = this.tbox()
+		return box
+	}
+	gr.push = function(obj){
+		this.add(obj)
+	}
+	gr.transforma =function(trans){
+		trans = trans.substring(1)
+		var coords = trans.split(",")
+		this.move(parseInt(coords[0]),parseInt(coords[1]))
+	}
+	return gr
+}
+
+Raphael.prototype.path = function(path,pathValues){
+	console.log(path)
+	console.log(pathValues)
+	for (ndx in pathValues){
+		var str = "{"+ndx+"}"
+		path = path.replace(str,pathValues[ndx])
+	}
+	console.log(path)
+	var rect = this.paper.path(path).fill("none")//.move(0,-10)
+	rect.insertBefore = function(obj){
+		this.parent().add(obj)
+		this.backward()
+	}
+	rect.getBBox= function(){
+		return this.tbox()
+	}
+	return rect
+}
+
+Raphael.prototype.setSize = function(width, height){
+	this.paper.size(width,height)
+}
+
+Raphael.prototype.setViewBox = function(x, y, w, h, fit){
+	this.paper.viewbox(x, y, w, h)  // , fit
+}
+
+Raphael.registerFont = function(font){
+	//
+}
+
+Raphael.text_bbox = function(){}
+
+Raphael.fn={}
\ No newline at end of file
diff --git a/src/flowchart.symbol.js b/src/flowchart.symbol.js
index 507331df..5d3b2ad2 100644
--- a/src/flowchart.symbol.js
+++ b/src/flowchart.symbol.js
@@ -94,7 +94,7 @@ Symbol.prototype.getAttr = function(attName) {
 };
 
 Symbol.prototype.initialize = function() {
-  this.group.transform('t' + this.getAttr('line-width') + ',' + this.getAttr('line-width'));
+  this.group.transforma('t' + this.getAttr('line-width') + ',' + this.getAttr('line-width'));
 
   this.width = this.group.getBBox().width;
   this.height = this.group.getBBox().height;
@@ -114,19 +114,19 @@ Symbol.prototype.getY = function() {
 };
 
 Symbol.prototype.shiftX = function(x) {
-  this.group.transform('t' + (this.getX() + x) + ',' + this.getY());
+  this.group.transforma('t' + (this.getX() + x) + ',' + this.getY());
 };
 
 Symbol.prototype.setX = function(x) {
-  this.group.transform('t' + x + ',' + this.getY());
+  this.group.transforma('t' + x + ',' + this.getY());
 };
 
 Symbol.prototype.shiftY = function(y) {
-  this.group.transform('t' + this.getX() + ',' + (this.getY() + y));
+  this.group.transforma('t' + this.getX() + ',' + (this.getY() + y));
 };
 
 Symbol.prototype.setY = function(y) {
-  this.group.transform('t' + this.getX() + ',' + y);
+  this.group.transforma('t' + this.getX() + ',' + y);
 };
 
 Symbol.prototype.getTop = function() {
@@ -377,8 +377,8 @@ Symbol.prototype.drawLineTo = function(symbol, text, origin) {
           intersections,
           inter;
 
-      var ePath = otherLine.attr('path'),
-          lPath = line.attr('path');
+      var ePath = otherLine.attr('d'),
+          lPath = line.attr('d');
 
       for (var iP = 0, lenP = ePath.length - 1; iP < lenP; iP++) {
         var newPath = [];
@@ -410,13 +410,13 @@ Symbol.prototype.drawLineTo = function(symbol, text, origin) {
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', res.x + lineWith * 2,  line2_from_y, res.x, line2_from_y - lineWith * 4, res.x - lineWith * 2, line2_from_y];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('path', lPath);
+                line.attr('d', lPath);
               } else {
                 newSegment = ['L', res.x - lineWith * 2,  line2_from_y];
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', res.x - lineWith * 2,  line2_from_y, res.x, line2_from_y - lineWith * 4, res.x + lineWith * 2, line2_from_y];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('path', lPath);
+                line.attr('d', lPath);
               }
             } else {
               if (line2_from_y > line2_to_y) {
@@ -424,13 +424,13 @@ Symbol.prototype.drawLineTo = function(symbol, text, origin) {
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', line2_from_x, res.y + lineWith * 2, line2_from_x + lineWith * 4, res.y, line2_from_x, res.y - lineWith * 2];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('path', lPath);
+                line.attr('d', lPath);
               } else {
                 newSegment = ['L', line2_from_x, res.y - lineWith * 2];
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', line2_from_x, res.y - lineWith * 2, line2_from_x + lineWith * 4, res.y, line2_from_x, res.y + lineWith * 2];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('path', lPath);
+                line.attr('d', lPath);
               }
             }
 

From 8f1a70759cfe3dc39ed24839a3fe37568abb1249 Mon Sep 17 00:00:00 2001
From: Christian Tzurcanu <christian.tzurcanu@gmail.com>
Date: Fri, 18 Sep 2015 18:05:31 +0300
Subject: [PATCH 2/3] type

---
 raphaela.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/raphaela.js b/raphaela.js
index a586ad4f..da4e7e12 100644
--- a/raphaela.js
+++ b/raphaela.js
@@ -74,6 +74,10 @@ Raphael.prototype.setViewBox = function(x, y, w, h, fit){
 	this.paper.viewbox(x, y, w, h)  // , fit
 }
 
+Raphael.prototype.type = function(){
+	return "svg.js"
+}
+
 Raphael.registerFont = function(font){
 	//
 }

From a784121bdad4162e478f46ecf8e598ed5d04da8a Mon Sep 17 00:00:00 2001
From: Adriano Raiano <adriano@raiano.ch>
Date: Sat, 19 Sep 2015 08:38:13 +0200
Subject: [PATCH 3/3] raphael and raphaela compatible

---
 example/index.html             |  5 +-
 src/flowchart.symbol.js        | 38 +++++++++------
 raphaela.js => src/raphaela.js | 88 +++++++++++++++-------------------
 3 files changed, 64 insertions(+), 67 deletions(-)
 rename raphaela.js => src/raphaela.js (50%)

diff --git a/example/index.html b/example/index.html
index bd9aec50..bbd26389 100644
--- a/example/index.html
+++ b/example/index.html
@@ -6,11 +6,12 @@
         <style type="text/css">
           .end-element { background-color : #FFCCFF; }
         </style>
-        <script src="../raphaela.js"></script>
+        <!--<script src="http://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"></script>-->
+        <script src="../src/raphaela.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/svg.js/2.0.5/svg.js"></script>
         <script src="http://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+        <!--<script src="http://flowchart.js.org/flowchart-latest.js"></script>-->
         <script src="../bin/flowchart-latest.js"></script>
-        <!--<script src="../bin/flowchart-latest.js"></script>-->
         <!--<script src="../release/flowchart-1.4.1.min.js"></script>-->
         <script>
 
diff --git a/src/flowchart.symbol.js b/src/flowchart.symbol.js
index 5d3b2ad2..56fa2292 100644
--- a/src/flowchart.symbol.js
+++ b/src/flowchart.symbol.js
@@ -1,3 +1,11 @@
+var transformFn = 'transform',
+    pathAttr = 'path';
+
+if (Raphael.type === 'svg.js') {
+  transformFn = 'transforma';
+  pathAttr = 'd';
+}
+
 function Symbol(chart, options, symbol) {
   this.chart = chart;
   this.group = this.chart.paper.set();
@@ -7,12 +15,12 @@ function Symbol(chart, options, symbol) {
   this.flowstate = (options.flowstate || 'future');
 
   this.next_direction = options.next && options['direction_next'] ? options['direction_next'] : undefined;
-  
+
   this.text = this.chart.paper.text(0, 0, options.text);
   //Raphael does not support the svg group tag so setting the text node id to the symbol node id plus t
   if (options.key) { this.text.node.id = options.key + 't'; }
   this.text.node.setAttribute('class', this.getAttr('class') + 't');
-  
+
   this.text.attr({
     'text-anchor': 'start',
     'x'          : this.getAttr('text-margin'),
@@ -47,12 +55,12 @@ function Symbol(chart, options, symbol) {
     }
     this.text.attr("text", tempText.substring(1));
   }
-  
+
   this.group.push(this.text);
 
   if (symbol) {
     var tmpMargin = this.getAttr('text-margin');
-    
+
     symbol.attr({
       'fill' : this.getAttr('fill'),
       'stroke' : this.getAttr('element-color'),
@@ -94,7 +102,7 @@ Symbol.prototype.getAttr = function(attName) {
 };
 
 Symbol.prototype.initialize = function() {
-  this.group.transforma('t' + this.getAttr('line-width') + ',' + this.getAttr('line-width'));
+  this.group[transformFn].call(this.group, 't' + this.getAttr('line-width') + ',' + this.getAttr('line-width'));
 
   this.width = this.group.getBBox().width;
   this.height = this.group.getBBox().height;
@@ -114,19 +122,19 @@ Symbol.prototype.getY = function() {
 };
 
 Symbol.prototype.shiftX = function(x) {
-  this.group.transforma('t' + (this.getX() + x) + ',' + this.getY());
+  this.group[transformFn].call(this.group, 't' + (this.getX() + x) + ',' + this.getY());
 };
 
 Symbol.prototype.setX = function(x) {
-  this.group.transforma('t' + x + ',' + this.getY());
+  this.group[transformFn].call(this.group, 't' + x + ',' + this.getY());
 };
 
 Symbol.prototype.shiftY = function(y) {
-  this.group.transforma('t' + this.getX() + ',' + (this.getY() + y));
+  this.group[transformFn].call(this.group, 't' + this.getX() + ',' + (this.getY() + y));
 };
 
 Symbol.prototype.setY = function(y) {
-  this.group.transforma('t' + this.getX() + ',' + y);
+  this.group[transformFn].call(this.group, 't' + this.getX() + ',' + y);
 };
 
 Symbol.prototype.getTop = function() {
@@ -377,8 +385,8 @@ Symbol.prototype.drawLineTo = function(symbol, text, origin) {
           intersections,
           inter;
 
-      var ePath = otherLine.attr('d'),
-          lPath = line.attr('d');
+      var ePath = otherLine.attr(pathAttr),
+          lPath = line.attr(pathAttr);
 
       for (var iP = 0, lenP = ePath.length - 1; iP < lenP; iP++) {
         var newPath = [];
@@ -410,13 +418,13 @@ Symbol.prototype.drawLineTo = function(symbol, text, origin) {
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', res.x + lineWith * 2,  line2_from_y, res.x, line2_from_y - lineWith * 4, res.x - lineWith * 2, line2_from_y];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('d', lPath);
+                line.attr(pathAttr, lPath);
               } else {
                 newSegment = ['L', res.x - lineWith * 2,  line2_from_y];
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', res.x - lineWith * 2,  line2_from_y, res.x, line2_from_y - lineWith * 4, res.x + lineWith * 2, line2_from_y];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('d', lPath);
+                line.attr(pathAttr, lPath);
               }
             } else {
               if (line2_from_y > line2_to_y) {
@@ -424,13 +432,13 @@ Symbol.prototype.drawLineTo = function(symbol, text, origin) {
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', line2_from_x, res.y + lineWith * 2, line2_from_x + lineWith * 4, res.y, line2_from_x, res.y - lineWith * 2];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('d', lPath);
+                line.attr(pathAttr, lPath);
               } else {
                 newSegment = ['L', line2_from_x, res.y - lineWith * 2];
                 lPath.splice(lP + 1, 0, newSegment);
                 newSegment = ['C', line2_from_x, res.y - lineWith * 2, line2_from_x + lineWith * 4, res.y, line2_from_x, res.y + lineWith * 2];
                 lPath.splice(lP + 2, 0, newSegment);
-                line.attr('d', lPath);
+                line.attr(pathAttr, lPath);
               }
             }
 
diff --git a/raphaela.js b/src/raphaela.js
similarity index 50%
rename from raphaela.js
rename to src/raphaela.js
index da4e7e12..783ebc53 100644
--- a/raphaela.js
+++ b/src/raphaela.js
@@ -1,87 +1,75 @@
 
 var Raphael = function(container, options){
 	this.paper = SVG(container)
-	this.registerFont = function(font){
-	//
-	return;
-}
 }
 
+Raphael.registerFont = function(font){};
+
+Raphael.text_bbox = function(){};
+
+Raphael.fn = function(){};
+
+Raphael.type = 'svg.js';
+
 Raphael.prototype.text = function(x, y, text){
-	console.log(x,y)
-	var text= this.paper.text(text)
-	//text.move(x,-text.height)
-	text.getBBox= function(){
-		return this.tbox()
-	}
-	return text
-}
+	var text = this.paper.text(text);
+	//text.move(x,-text.height);
+	text.getBBox = function(){
+		return this.tbox();
+	};
+	return text;
+};
 
 Raphael.prototype.rect = function(x, y, width, height, round){
-	var rect = this.paper.rect(width, height)//.move(x,y-10)
-	if (round) rect.radius(round)
+	var rect = this.paper.rect(width, height);//.move(x,y-10)
+	if (round) rect.radius(round);
 	rect.insertBefore = function(obj){
 		this.parent().add(obj)
 		this.back()
-	}
-	rect.getBBox= function(){
+	};
+	rect.getBBox = function(){
 		return this.tbox()
-	}
-	return rect
-}
+	};
+	return rect;
+};
 
 Raphael.prototype.set = function(){
 	var gr = this.paper.group()
 	gr.getBBox= function(){
 		var box = this.tbox()
 		return box
-	}
+	};
 	gr.push = function(obj){
 		this.add(obj)
-	}
+	};
 	gr.transforma =function(trans){
 		trans = trans.substring(1)
 		var coords = trans.split(",")
 		this.move(parseInt(coords[0]),parseInt(coords[1]))
-	}
-	return gr
-}
+	};
+	return gr;
+};
 
 Raphael.prototype.path = function(path,pathValues){
-	console.log(path)
-	console.log(pathValues)
 	for (ndx in pathValues){
-		var str = "{"+ndx+"}"
-		path = path.replace(str,pathValues[ndx])
+		var str = "{"+ndx+"}";
+		path = path.replace(str,pathValues[ndx]);
 	}
-	console.log(path)
-	var rect = this.paper.path(path).fill("none")//.move(0,-10)
+	var rect = this.paper.path(path).fill("none");//.move(0,-10)
 	rect.insertBefore = function(obj){
-		this.parent().add(obj)
-		this.backward()
-	}
+		this.parent().add(obj);
+		this.backward();
+	};
 	rect.getBBox= function(){
-		return this.tbox()
-	}
-	return rect
+		return this.tbox();
+	};
+	return rect;
 }
 
 Raphael.prototype.setSize = function(width, height){
-	this.paper.size(width,height)
+	this.paper.size(width,height);
 }
 
 Raphael.prototype.setViewBox = function(x, y, w, h, fit){
-	this.paper.viewbox(x, y, w, h)  // , fit
+	this.paper.viewbox(x, y, w, h); // , fit
 }
-
-Raphael.prototype.type = function(){
-	return "svg.js"
-}
-
-Raphael.registerFont = function(font){
-	//
-}
-
-Raphael.text_bbox = function(){}
-
-Raphael.fn={}
\ No newline at end of file