Merge pull request #852 from Codeinwp/bugfix/851

Fix multiple chart rendering issue

Author: cristian-ungureanu

classes/Visualizer/Module/Frontend.php

@@ -353,6 +353,10 @@ public function renderChart( $atts ) {
 				return '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '>' . wp_get_attachment_image( $chart_image, 'full' ) . '</div>';
 			}
 		}
+		// Unset chart image base64 string.
+		if ( isset( $settings['chart-img'] ) ) {
+			unset( $settings['chart-img'] );
+		}
 
 		// add chart to the array
 		$this->_charts[ $id ] = array(
@@ -395,22 +399,29 @@ public function renderChart( $atts ) {
 
 		$actions_div            .= $css;
 
+		$_charts = array();
+		$_charts_type = '';
 		foreach ( $this->_charts as $id => $array ) {
+			$_charts = $this->_charts;
 			$library = $array['library'];
-			wp_register_script(
-				"visualizer-render-$library",
-				VISUALIZER_ABSURL . 'js/render-facade.js',
-				apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
-				Visualizer_Plugin::VERSION,
-				true
-			);
-
-			wp_enqueue_script( "visualizer-render-$library" );
+			$_charts_type = $library;
+			if ( ! wp_script_is( "visualizer-render-$library", 'registered' ) ) {
+				wp_register_script(
+					"visualizer-render-$library",
+					VISUALIZER_ABSURL . 'js/render-facade.js',
+					apply_filters( 'visualizer_assets_render', array( 'jquery', 'visualizer-customization' ), true ),
+					Visualizer_Plugin::VERSION,
+					true
+				);
+				wp_enqueue_script( "visualizer-render-$library" );
+			}
+		}
+		if ( wp_script_is( "visualizer-render-$_charts_type" ) ) {
 			wp_localize_script(
-				"visualizer-render-$library",
+				"visualizer-render-$_charts_type",
 				'visualizer',
 				array(
-					'charts'        => $this->_charts,
+					'charts'        => $_charts,
 					'language'      => $this->get_language(),
 					'map_api_key'   => get_option( 'visualizer-map-api-key' ),
 					'rest_url'      => version_compare( $wp_version, '4.7.0', '>=' ) ? rest_url( 'visualizer/v' . VISUALIZER_REST_VERSION . '/action/#id#/#type#/' ) : '',
@@ -422,8 +433,8 @@ public function renderChart( $atts ) {
 					'is_front'  => true,
 				)
 			);
-			wp_enqueue_style( 'visualizer-front' );
 		}
+		wp_enqueue_style( 'visualizer-front' );
 
 		// return placeholder div
 		return $actions_div . '<div id="' . $id . '"' . $this->getHtmlAttributes( $attributes ) . '></div>' . $this->addSchema( $chart->ID );