From 5ea3b310f9a16747bc95d4c8397254ad941b099d Mon Sep 17 00:00:00 2001 From: girishkrishaweb Date: Thu, 13 May 2021 18:21:21 +0530 Subject: [PATCH] Fix google chart library conflict with other plugins #801 --- js/media.js | 2 +- js/render-google.js | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/js/media.js b/js/media.js index 34bbec03a..1e9560e9c 100644 --- 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 index de890c224..d0d099566 100644 --- 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(); + } } }); });