Fix in region lines

jorgecgll · jorgecgll · commit 84c95fbaee1f · 2016-06-28T11:43:35.000-07:00
diff --git a/Chart.BarFunnel.js b/Chart.BarFunnel.js
@@ -160,21 +160,22 @@
 					if(rectangleElementOptions.stepLabel.display && (index != 0)) {
 						var label = (dataset.data[index] / dataset.data[0]) * 100;
 
-						// Draw Step Label
-						ctx.font = vm.stepLabelFontSize + "px " + options.defaultFontFamily;
-						ctx.fillStyle = vm.stepLabelColor;
-						ctx.textAlign = "center";
-						ctx.fillText(label.toFixed(0) + "%", vm.x, vm.y - vm.stepLabelFontSize);
+						if (dataset.data[index] > 0) {
+							// Draw Step Label
+							ctx.font = vm.stepLabelFontSize + "px " + options.defaultFontFamily;
+							ctx.fillStyle = vm.stepLabelColor;
+							ctx.textAlign = "center";
+							ctx.fillText(label.toFixed(0) + "%", vm.x, vm.y - vm.stepLabelFontSize);
+						}
 					}
 
 					if (chartOptions.region.display && (index < meta.data.length - 1)) {
 						var nextVm = meta.data[index + 1]._view;
-						var nextModel = meta.data[index + 1]._model;
 
 						var regionCorners = [
 							[vm.x + halfWidth, top],
-							[nextModel.x - halfWidth, nextVm.base - (nextVm.base - nextVm.y)],
-							[nextModel.x - halfWidth, nextVm.base],
+							[nextVm.x - halfWidth, nextVm.base - (nextVm.base - nextVm.y - 1)],
+							[nextVm.x - halfWidth, nextVm.base],
 							[vm.x + halfWidth, vm.base]
 						];
 
diff --git a/Chart.BarFunnel.min.js b/Chart.BarFunnel.min.js
diff --git a/src/chart.barfunnel.js b/src/chart.barfunnel.js
@@ -150,21 +150,22 @@
 					if(rectangleElementOptions.stepLabel.display && (index != 0)) {
 						var label = (dataset.data[index] / dataset.data[0]) * 100;
 
-						// Draw Step Label
-						ctx.font = vm.stepLabelFontSize + "px " + options.defaultFontFamily;
-						ctx.fillStyle = vm.stepLabelColor;
-						ctx.textAlign = "center";
-						ctx.fillText(label.toFixed(0) + "%", vm.x, vm.y - vm.stepLabelFontSize);
+						if (dataset.data[index] > 0) {
+							// Draw Step Label
+							ctx.font = vm.stepLabelFontSize + "px " + options.defaultFontFamily;
+							ctx.fillStyle = vm.stepLabelColor;
+							ctx.textAlign = "center";
+							ctx.fillText(label.toFixed(0) + "%", vm.x, vm.y - vm.stepLabelFontSize);
+						}
 					}
 
 					if (chartOptions.region.display && (index < meta.data.length - 1)) {
 						var nextVm = meta.data[index + 1]._view;
-						var nextModel = meta.data[index + 1]._model;
 
 						var regionCorners = [
 							[vm.x + halfWidth, top],
-							[nextModel.x - halfWidth, nextVm.base - (nextVm.base - nextVm.y)],
-							[nextModel.x - halfWidth, nextVm.base],
+							[nextVm.x - halfWidth, nextVm.base - (nextVm.base - nextVm.y - 1)],
+							[nextVm.x - halfWidth, nextVm.base],
 							[vm.x + halfWidth, vm.base]
 						];
 
