Fix dataStore location + Firefox Bug is no longer present

Author: AB-xdev

vaadin-chartjs-wrapper/src/main/resources/META-INF/resources/frontend/src/chartControlFunc.js

@@ -3,7 +3,7 @@ if(window.xVaadinChartjsWrapper == undefined) window.xVaadinChartjsWrapper = {};
 /** https://stackoverflow.com/a/46522991 */
 if(!window.xVaadinChartjsWrapper.dataStorage) {
   window.xVaadinChartjsWrapper.dataStorage = {
-    _storage: new WeakMap(),
+    _storage: new WeakMap(), /* This is important to not cause a memory leak */
     put: function (element, key, obj) {
         if (!this._storage.has(element)) {
             this._storage.set(element, new Map());
@@ -35,36 +35,32 @@ window.xVaadinChartjsWrapper.buildChart = function buildChart(parentId, canvasId
     console.log("buildChart: parent was null!");
     return;
   }
-
+  
   while (parent.firstChild) {
     parent.removeChild(parent.firstChild);
   }
-
+  
   let canvas = document.createElement("canvas");
   canvas.id = canvasId;
 
   parent.appendChild(canvas);
 
   let ctx = canvas.getContext('2d');
 
-  // Run async due to https://bugzilla.mozilla.org/show_bug.cgi?id=1792860
-  setTimeout(() => {
-    let chart = new Chart(ctx, jsonpayload);
+  let chart = new Chart(ctx, jsonpayload);
 
-    // Add chart to canvas
-    dataStorage.put(document.getElementById(canvasId), 'chart-data', chart);
-  }, 1);
+  // Add chart to canvas
+  window.xVaadinChartjsWrapper.dataStorage.put(document.getElementById(canvasId), 'chart-data', chart);
 }
 
 window.xVaadinChartjsWrapper.tryDestroyChart = function tryDestroyChart(canvasId) {
   let canvas = document.getElementById(canvasId);
-  
   if(canvas == null) {
     console.debug(`tryDestroyChart: Canvas[id=${canvasId}] was null!`);
     return;
   }
 
-  let chart = dataStorage.get(canvas, 'chart-data');
+  let chart = window.xVaadinChartjsWrapper.dataStorage.get(canvas, 'chart-data');
 
   if(chart == null) {
       console.debug(`tryDestroyChart: Chart in Canvas[id=${canvasId}] was null!`);