Fixed chart race condition which caused some chart settings to not be…

… applied on heavy charts.
finos · Mar 12, 2018 · 26c4964 · 26c4964
1 parent ee69176
commit 26c4964
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/packages/perspective-viewer-highcharts/src/js/highcharts.js b/packages/perspective-viewer-highcharts/src/js/highcharts.js
@@ -223,8 +223,6 @@ function* visible_rows(json, hidden) {
     }
 }
 
-
-
 export function draw(mode) {
     return async function(el, view, hidden, task) {
         var row_pivots = this._view_columns('#row_pivots perspective-row:not(.off)');
@@ -233,6 +231,16 @@ export function draw(mode) {
 
         let [js, schema] = await Promise.all([view.to_json(), view.schema()]);
 
+        if (this.hasAttribute('updating') && this._chart) {
+            chart = this._chart
+            this._chart = undefined;
+            try {
+                chart.destroy();
+            } catch (e) {
+                console.warn("Scatter plot destroy() call failed - this is probably leaking memory");
+            }
+        }
+
         if (task.cancelled) {
             return;
         }
@@ -543,16 +551,6 @@ export function draw(mode) {
             });
         }
 
-        if (this.hasAttribute('updating') && this._chart) {
-            chart = this._chart
-            this._chart = undefined;
-            try {
-                chart.destroy();
-            } catch (e) {
-                console.warn("Scatter plot destroy() call failed - this is probably leaking memory");
-            }
-        }
-
         if (this._chart) {
             if (mode === 'scatter') {
                 let new_radius = Math.min(8, Math.max(4, Math.floor((this._chart.chartWidth + this._chart.chartHeight) / 240)));

diff --git a/packages/perspective-viewer/src/js/view.js b/packages/perspective-viewer/src/js/view.js
@@ -507,7 +507,7 @@ function update() {
                     }).catch(err => {
                         console.error("Error rendering plugin.", err);
                     });
-                })(task);
+                })(this._task);
             }, timeout || 0);
         }
     });