Merge pull request #1092 from Codeinwp/fix/classic-plugin

Fix Google chart rendering condition for Classic Plugin

Author: vytisbulkevicius

js/media/view.js

@@ -57,7 +57,7 @@
 			chart.settings = model.get('settings');
 			chart.settings.width = self.options.width;
 			chart.settings.height = self.options.height;
-            $('#' + self.id).append(model.get('css'));
+            $('#' + self.id).parent().append(model.get('css'));
 
             $('body').trigger('visualizer:render:specificchart:start', {id: self.id, chart: chart, v: {page_type: 'post'}} );
 		}

js/render-google.js

@@ -50,11 +50,12 @@ var isResizeRequest = false;
     function renderSpecificChart(id, chart) {
         var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
 
-        if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader)' ).length > 0 ) ) ) {
+        if( chart.library !== 'google' ) {
             return;
         }
-
-        if(chart.library !== 'google'){
+      
+        // Bail if the chart is already rendered or is being rendered.
+        if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader, style)' ).length > 0 ) ) ) {
             return;
         }
         rendered_charts[id] = 'yes';