Merge pull request #846 from Codeinwp/bugfix/845

Fix chart series indexing issue in table chart

Author: selul

js/render-google.js

@@ -20,7 +20,12 @@ var __visualizer_chart_images   = [];
         // remember, some charts do not support annotations so they should not be included in this.
         var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick'];
         if ( undefined !== chart.settings && undefined !== chart.settings.series && undefined === chart.settings.series.length ) {
-            chart.settings.series = Object.values( chart.settings.series );
+            var chartSeries = [];
+            var chartSeriesValue = Object.values( chart.settings.series );
+            $.each( Object.keys( chart.settings.series ), function( index, element ) {
+                chartSeries[element] = chartSeriesValue[index];
+            } );
+            chart.settings.series = chartSeries;
         }
         if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) {
             hasAnnotation = chart.series.length - chart.settings.series.length > 1;
@@ -310,11 +315,13 @@ var __visualizer_chart_images   = [];
             var arr = id.split('-');
             __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
             try{
-                var img = render.getImageURI();
-                __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
-                $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
-                if ( $( '#chart-img' ).length ) {
-                    $( '#chart-img' ).val( img );
+                if ( typeof render.getImageURI !== 'undefined' ) {
+                    var img = render.getImageURI();
+                    __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
+                    $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
+                    if ( $( '#chart-img' ).length ) {
+                        $( '#chart-img' ).val( img );
+                    }
                 }
             }catch(error){
                 var canvas = document.getElementById( 'canvas' );