adding rendered event to each chart and renderComplete to vis

airow · Sep 20, 2016 · 8324f5a · 8324f5a
1 parent e198f41
commit 8324f5a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 3 deletions.
diff --git a/src/ui/public/vislib/lib/handler/handler.js b/src/ui/public/vislib/lib/handler/handler.js
@@ -116,14 +116,22 @@ export default function HandlerBaseClass(Private) {
       });
 
       // render the chart(s)
-      selection.selectAll('.chart')
-      .each(function (chartData) {
+      this.loadedCount = 0;
+      const chartSelection = selection.selectAll('.chart');
+      chartSelection.each(function (chartData) {
         const chart = new self.ChartClass(self, this, chartData);
 
         self.vis.activeEvents().forEach(function (event) {
           self.enable(event, chart);
         });
 
+        chart.events.on('rendered', () => {
+          self.loadedCount++;
+          if (self.loadedCount === chartSelection.length) {
+            charts[0].events.emit('renderComplete');
+          }
+        });
+
         charts.push(chart);
         chart.render();
       });

diff --git a/src/ui/public/vislib/visualizations/_map.js b/src/ui/public/vislib/visualizations/_map.js
@@ -214,7 +214,7 @@ export default function MapFactory(Private, tilemap, $sanitize) {
       this._tileLayer.on('load', () => {
         if (!self._events) return;
 
-        self._events.emit('mapLoaded', {
+        self._events.emit('rendered', {
           chart: self._chartData,
           map: self.map,
           center: self._mapCenter,

diff --git a/src/ui/public/vislib/visualizations/area_chart.js b/src/ui/public/vislib/visualizations/area_chart.js
@@ -365,6 +365,10 @@ export default function AreaChartFactory(Private) {
             timeMarker.render(svg);
           }
 
+          self.events.emit('rendered', {
+            chart: data
+          });
+
           return svg;
         });
       };

diff --git a/src/ui/public/vislib/visualizations/column_chart.js b/src/ui/public/vislib/visualizations/column_chart.js
@@ -315,6 +315,10 @@ export default function ColumnChartFactory(Private) {
             timeMarker.render(svg);
           }
 
+          self.events.emit('rendered', {
+            chart: data
+          });
+
           return svg;
         });
       };

diff --git a/src/ui/public/vislib/visualizations/line_chart.js b/src/ui/public/vislib/visualizations/line_chart.js
@@ -339,6 +339,10 @@ export default function LineChartFactory(Private) {
             timeMarker.render(svg);
           }
 
+          self.events.emit('rendered', {
+            chart: data
+          });
+
           return svg;
         });
       };

diff --git a/src/ui/public/vislib/visualizations/pie_chart.js b/src/ui/public/vislib/visualizations/pie_chart.js
@@ -202,6 +202,10 @@ export default function PieChartFactory(Private) {
           const path = self.addPath(width, height, svg, slices);
           self.addPathEvents(path);
 
+          self.events.emit('rendered', {
+            chart: data
+          });
+
           return svg;
         });
       };