Fix google chart library conflict with other plugins #801

Codeinwp · May 13, 2021 · 5ea3b31 · 5ea3b31
1 parent e254897
commit 5ea3b31
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/js/media.js b/js/media.js
@@ -5,7 +5,7 @@
 	wpmvtv = wpmv.toolbar.visualizer;
 	mediaFrame = wpmv.MediaFrame.Post;
 
-	g.charts.load("current", { packages: ["corechart", "geochart", "gauge", "table", "timeline"] });
+	g.load('visualization', 'current', { packages: ["corechart", "geochart", "gauge", "table", "timeline"] });
 
 	wpmv.MediaFrame.Post = mediaFrame.extend({
 		initialize: function() {

diff --git a/js/render-google.js b/js/render-google.js
@@ -451,14 +451,15 @@ var __visualizer_chart_images   = [];
         }
 
         objects = {};
-        google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language});
-        google.charts.setOnLoadCallback(function() {
-            gv = google.visualization;
-            all_charts = v.charts;
-            if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
-                renderChart(v.id);
-            } else {
-                render();
+        google.load( 'visualization', 'current', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
+            callback: function () {
+                gv = google.visualization;
+                all_charts = v.charts;
+                if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
+                    renderChart(v.id);
+                } else {
+                    render();
+                }
             }
         });
     });