Merge branch 'fix/memoryleak'

Author: Jelte Lagendijk

src/ChartJS/widgets/Core.js

@@ -76,6 +76,8 @@ define([
 
         _tooltipNode: null,
 
+        _chartEntityObject: null,
+
         startup: function () {
             logger.debug(this.id + ".startup");
 
@@ -142,12 +144,13 @@ define([
             this._mxObj = obj;
 
             if (this._handle !== null) {
-                mx.data.unsubscribe(this._handle);
+                this.unsubscribe(this._handle);
                 this._handle = null;
             }
 
             if (this._mxObj) {
-                this._handle = mx.data.subscribe({
+                logger.debug(this.id + ".update obj " + this._mxObj.getGuid());
+                this._handle = this.subscribe({
                     guid: this._mxObj.getGuid(),
                     callback: lang.hitch(this, this._loadData)
                 });
@@ -184,6 +187,8 @@ define([
                     return;
                 }
 
+                this._chartEntityObject = obj;
+
                 // Retrieve datasets
                 mx.data.get({
                     guids: guids,
@@ -217,13 +222,46 @@ define([
 
         uninitialize: function () {
             logger.debug(this.id + ".uninitialize");
+
+            //console.log(this._data);
             if (this._handle !== null) {
-                mx.data.unsubscribe(this._handle);
+                this.unsubscribe(this._handle);
             }
 
             if (this._tooltipNode) {
                 domConstruct.destroy(this._tooltipNode);
             }
+
+            if (mx.data.release && !mx.version || mx.version && parseInt(mx.version.split(".")[0]) < 7) { // mx.data.release is deprecated in MX7, so this is for MX5 & MX6
+                if (this._data && this._data.datasets && this._data.datasets.length > 0) {
+                    logger.debug(this.id + ".uninitialize release datasets");
+                    for (var i = 0; i < this._data.datasets.length; i++) {
+                        var data = this._data.datasets[i];
+                        if (data.dataset && data.dataset.getGuid) {
+                            logger.debug(this.id + ".uninitialize release dataset obj " + data.dataset.getGuid());
+                            mx.data.release(data.dataset);
+                        }
+                        if (data.points && data.points.length > 0) {
+                            for (var j = 0; j < data.points.length; j++) {
+                                var point = data.points[j];
+                                if (point && point.getGuid) {
+                                    logger.debug(this.id + ".uninitialize release datapoint " + point.getGuid());
+                                    mx.data.release(point);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (this._chartEntityObject !== null) {
+                    logger.debug(this.id + ".uninitialize release obj " + this._chartEntityObject.getGuid());
+                    mx.data.release(this._chartEntityObject);
+                }
+
+                if (this._data.object && this._data.object.getGuid) {
+                    mx.data.release(this._data.object);
+                }
+            }
         },
 
         customTooltip: function (tooltip) {

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

@@ -68,6 +68,7 @@ define([
                     dataset = null;
 
                 this._data.object = obj;
+                this._chartEntityObject = obj;
 
                 // Retrieve datasets
                 mx.data.get({
@@ -135,7 +136,7 @@ define([
             }));
 
             // Set the con
-            html.set(this._numberNode, this._data.object.get(this.numberInside));
+            html.set(this._numberNode, this._data.object.get(this.numberInside).toString());
 
             // Add class to determain chart type
             this._addChartClass("chartjs-doughnut-chart");

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

@@ -67,6 +67,7 @@ define([
                     dataset = null;
 
                 this._data.object = obj;
+                this._chartEntityObject = obj;
 
                 // Retrieve datasets
                 mx.data.get({
@@ -137,7 +138,7 @@ define([
                 this._chart = new this._chartJS(this._ctx, chartProperties);
 
                 // Set the con
-                html.set(this._numberNode, this._data.object.get(this.numberInside));
+                html.set(this._numberNode, this._data.object.get(this.numberInside).toString());
 
                 // Add class to determain chart type
                 this._addChartClass("chartjs-pie-chart");

src/ChartJS/widgets/PolarChart/widget/PolarChart.js

@@ -69,6 +69,7 @@ define([
                     dataset = null;
 
                 this._data.object = obj;
+                this._chartEntityObject = obj;
 
                 // Retrieve datasets
                 mx.data.get({