Merge branch 'Mcpoowl-master'

Author: Jelte Lagendijk

package.json

@@ -1,9 +1,9 @@
 {
   "name": "ChartJS",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "This widget is a wrapper for the ChartJS library and you can use it to visualize your aggregated data.",
-  "license": "",
-  "author": "",
+  "license": "Apache License, Version 2",
+  "author": "Mendix",
   "private": true,
   "dependencies": {},
   "devDependencies": {

src/ChartJS/widgets/DoughnutChart/widget/DoughnutChart.js

@@ -119,8 +119,6 @@ define([
                     //Number - The width of each segment stroke
                     segmentStrokeWidth : this.segmentStrokeWidth,
 
-                    //Number - The percentage of the chart that we cut out of the middle
-                    percentageInnerCutout : this.percentageInnerCutout, // This is 0 for Pie charts
 
                     //Number - Amount of animation steps
                     animationSteps : this.animationSteps,
@@ -142,6 +140,9 @@ define([
                     // maintainAspectRatio
                     maintainAspectRatio : this.maintainAspectRatio,
 
+                    //Number - The percentage of the chart that we cut out of the middle    
+                    cutoutPercentage : this.percentageInnerCutout,
+
                     // Custom tooltip?
                     customTooltips : false //lang.hitch(this, this.customTooltip)
 

src/ChartJS/widgets/PieChart/widget/PieChart.js

@@ -115,9 +115,6 @@ define([
                     //Number - The width of each segment stroke
                     segmentStrokeWidth : this.segmentStrokeWidth,
 
-                    //Number - The percentage of the chart that we cut out of the middle
-                    percentageInnerCutout : 0, // This is 0 for Pie charts
-
                     //Number - Amount of animation steps
                     animationSteps : this.animationSteps,
 
@@ -138,6 +135,10 @@ define([
                     // maintainAspectRatio
                     maintainAspectRatio : this.maintainAspectRatio,
 
+
+                    //cutOut of pie
+                    cutoutPercentage : 0, //always zero for Pie chart
+
                     // Custom tooltip?
                     customTooltips : false //lang.hitch(this, this.customTooltip)
 

src/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="ChartJS" version="3.1.1" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="ChartJS" version="3.1.2" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="ChartJS/widgets/BarChart/BarChart.xml"/>
             <widgetFile path="ChartJS/widgets/LineChart/LineChart.xml"/>