Cleaning error fix (adrai#188)

murich · adrai · commit 56cf108ffd3a · 2019-11-11T08:25:09.000+01:00
* Cleaning error fix

* Linestyle parsing cycle fix

* Dynamic flowState update
diff --git a/src/flowchart.chart.js b/src/flowchart.chart.js
@@ -170,7 +170,7 @@ FlowChart.prototype.render = function() {
 FlowChart.prototype.clean = function() {
   if (this.paper) {
     var paperDom = this.paper.canvas;
-    paperDom.parentNode.removeChild(paperDom);
+    paperDom.parentNode && paperDom.parentNode.removeChild(paperDom);
   }
 };
 
diff --git a/src/flowchart.parse.js b/src/flowchart.parse.js
@@ -119,6 +119,9 @@ function parse(input) {
     },
     clean: function() {
       this.diagram.clean();
+    },
+    options: function() {
+      return this.diagram.options;
     }
   };
 
@@ -311,12 +314,12 @@ function parse(input) {
 
       // line style
       var lineStyleSymbols = line.split('@>');
-      for (var iSS = 0, lenSS = lineStyleSymbols.length; iSS < lenSS; i++) {
-        if ((iSS + 1) != lenSS) {
+      for (var iSS = 0, lenSS = lineStyleSymbols.length; iSS < lenSS; iSS++) {
+        if ((iSS + 1) !== lenSS) {
           var curSymb = getSymbol(lineStyleSymbols[iSS]);
           var nextSymbol = getSymbol(lineStyleSymbols[iSS+1]);
 
-          curSymb['lineStyle'][nextSymbol.key] = JSON.parse(getStyle(lineStyleSymbols[i + 1]));
+          curSymb['lineStyle'][nextSymbol.key] = JSON.parse(getStyle(lineStyleSymbols[iSS + 1]));
         }
       }
     }
diff --git a/src/jquery-plugin.js b/src/jquery-plugin.js
@@ -1,13 +1,79 @@
 if (typeof jQuery != 'undefined') {
 	var parse = require('./flowchart.parse');
+
 	(function( $ ) {
-		$.fn.flowChart = function( options ) {
-			return this.each(function() {
-				var $this = $(this);
-				var chart = parse($this.text());
-				$this.html('');
-				chart.drawSVG(this, options);
-			});
+		function paramFit(needle, haystack) {
+			return needle == haystack ||
+			( Array.isArray(haystack) && (haystack.includes(needle) || haystack.includes(Number(needle)) ))
+		}
+		var methods = {
+			init : function(options) {
+				return this.each(function() {
+					var $this = $(this);
+					this.chart = parse($this.text());
+					$this.html('');
+					this.chart.drawSVG(this, options);
+				});
+			},
+			setFlowStateByParam : function(param, paramValue, newFlowState) {
+				return this.each(function() {
+					var chart = this.chart;
+
+					// @todo this should be part of Symbol API
+					var nextSymbolKeys = ['next', 'yes', 'no', 'path1', 'path2', 'path3'];
+
+					for (var property in chart.symbols) {
+						if (chart.symbols.hasOwnProperty(property)) {
+							var symbol = chart.symbols[property];
+							var val = symbol.params[param];
+							if (paramFit(val, paramValue)) {
+								symbol.flowstate = newFlowState;
+								for (var nextSymbolKey of nextSymbolKeys) {
+									if (
+										symbol[nextSymbolKey] &&
+										symbol[nextSymbolKey]['params'] &&
+										symbol[nextSymbolKey]['params'][param] &&
+										paramFit(symbol[nextSymbolKey]['params'][param], paramValue)
+									) {
+										symbol.lineStyle[symbol[nextSymbolKey]['key']] = {stroke: chart.options()['flowstate'][newFlowState]['fill']};
+									}
+								}
+							}
+						}
+					}
+
+					chart.clean();
+					chart.drawSVG(this);
+				});
+
+			},
+			clearFlowState: function () {
+				return this.each(function() {
+					var chart = this.chart;
+
+					for (var property in chart.symbols) {
+						if (chart.symbols.hasOwnProperty(property)) {
+							var node = chart.symbols[property];
+							node.flowstate = '';
+						}
+					}
+
+					chart.clean();
+					chart.drawSVG(this);
+				});
+			}
 		};
+
+		$.fn.flowChart = function(methodOrOptions) {
+			if ( methods[methodOrOptions] ) {
+				return methods[ methodOrOptions ].apply( this, Array.prototype.slice.call( arguments, 1 ));
+			} else if ( typeof methodOrOptions === 'object' || ! methodOrOptions ) {
+				// Default to "init"
+				return methods.init.apply( this, arguments );
+			} else {
+				$.error( 'Method ' +  methodOrOptions + ' does not exist on jQuery.flowChart' );
+			}
+		};
+
 	})(jQuery); // eslint-disable-line
 }

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ FlowChart.prototype.render = function() {`
`170`	`170`	`FlowChart.prototype.clean = function() {`
`171`	`171`	`if (this.paper) {`
`172`	`172`	`var paperDom = this.paper.canvas;`
`173`		`- paperDom.parentNode.removeChild(paperDom);`
	`173`	`+ paperDom.parentNode && paperDom.parentNode.removeChild(paperDom);`
`174`	`174`	`}`
`175`	`175`	`};`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,9 @@ function parse(input) {`
`119`	`119`	`},`
`120`	`120`	`clean: function() {`
`121`	`121`	`this.diagram.clean();`
	`122`	`+ },`
	`123`	`+ options: function() {`
	`124`	`+ return this.diagram.options;`
`122`	`125`	`}`
`123`	`126`	`};`
`124`	`127`
`@@ -311,12 +314,12 @@ function parse(input) {`
`311`	`314`
`312`	`315`	`// line style`
`313`	`316`	`var lineStyleSymbols = line.split('@>');`
`314`		`- for (var iSS = 0, lenSS = lineStyleSymbols.length; iSS < lenSS; i++) {`
`315`		`- if ((iSS + 1) != lenSS) {`
	`317`	`+ for (var iSS = 0, lenSS = lineStyleSymbols.length; iSS < lenSS; iSS++) {`
	`318`	`+ if ((iSS + 1) !== lenSS) {`
`316`	`319`	`var curSymb = getSymbol(lineStyleSymbols[iSS]);`
`317`	`320`	`var nextSymbol = getSymbol(lineStyleSymbols[iSS+1]);`
`318`	`321`
`319`		`- curSymb['lineStyle'][nextSymbol.key] = JSON.parse(getStyle(lineStyleSymbols[i + 1]));`
	`322`	`+ curSymb['lineStyle'][nextSymbol.key] = JSON.parse(getStyle(lineStyleSymbols[iSS + 1]));`
`320`	`323`	`}`
`321`	`324`	`}`
`322`	`325`	`}`