Merge pull request eea#47 from eea/develop

Refs #120846 fix pushed to master as well
collective · Oct 6, 2020 · c6e0451 · c6e0451
2 parents dde48ae + 02f533b
commit c6e0451
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+20.7 - (2020-10-06)
+---------------------------
+* Bug fix: Load charts api from loader.js instead of gsapi in all cases;
+  Use google.setOnLoadCallback instead of jQuery(document).ready
+  [szabozo0 120846]
+
 20.6 - (2020-09-18)
 ---------------------------
 * Change: re-enabled resizing of charts when window is resized

diff --git a/eea/googlecharts/version.txt b/eea/googlecharts/version.txt
@@ -1 +1 @@
-20.6
+20.7
diff --git a/eea/googlecharts/views/js/view.js b/eea/googlecharts/views/js/view.js
@@ -1000,7 +1000,8 @@ var changeDashboardId = function(idx){
     }
 };
 
-jQuery(document).ready(function($){
+jQuery(function($){
+  google.setOnLoadCallback(function(){
     // workaround for firefox issue: https://taskman.eionet.europa.eu/issues/9941
     // Removed workaround as the issue has been already fixed. Details here:
     // https://code.google.com/p/google-visualization-api-issues/issues/detail?id=598
@@ -1014,6 +1015,7 @@ jQuery(document).ready(function($){
     //     }
     // }
     // end of workaround
+
     if (typeof(googlechart_config_array) == 'undefined'){
         return;
     }
@@ -1111,5 +1113,5 @@ jQuery(document).ready(function($){
     }));
 
     jQuery(window).trigger("hashchange");
-
+  });
 });
diff --git a/eea/googlecharts/views/zpt/chart-full.pt b/eea/googlecharts/views/zpt/chart-full.pt
@@ -7,7 +7,7 @@
 <script type="text/javascript" tal:attributes="src view/jquery_src"></script>
 <script type="text/javascript" src="++resource++jquery-migrate.js"></script>
 <script type="text/javascript" src="++resource++collective.js.underscore/underscore.min.js"></script>
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
 <script type="text/javascript" src="++resource++eea.googlecharts.chart.js"></script>
 <script type="text/javascript" src="++resource++eea.googlecharts.datatable.js"></script>
   <tal:jqueryui tal:define="eea_jqueryui exists:here/collective.js.jqueryui.custom.min.eea.js; portal_url context/@@plone_portal_state/portal_url">
@@ -18,7 +18,8 @@
 <script type="text/javascript">
     google.load('visualization', '1.0', {packages: ['controls']});
 
-    jQuery(document).ready(function($){
+    jQuery(function($){
+      google.setOnLoadCallback(function(){
         var row_filters = {};
         var sortAsc = 'asc';
         if (row_filters_str.length > 0){
@@ -137,6 +138,7 @@
         };
 
         drawGoogleChart(googlechart_params);
+      });
     });
     function exportToPng(){
         var svgobj = jQuery("#googlechart_full").find("iframe").contents().find("#chart");

diff --git a/eea/googlecharts/views/zpt/charts.pt b/eea/googlecharts/views/zpt/charts.pt
@@ -43,7 +43,7 @@
     </div>
 </tal:tabs>
 
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
 
 <tal:comment condition="nothing">
 <!-- XXX Use GoogleChartsConfig instead of googlechart_config_array -->

diff --git a/eea/googlecharts/views/zpt/embed-chart.pt b/eea/googlecharts/views/zpt/embed-chart.pt
@@ -198,7 +198,7 @@
                     }
                     return settings;
                 }
-		jQuery(function($){
+        jQuery(function($){
                 google.setOnLoadCallback(function(){
                     var chart_type = chart_json_$vhash.chartType;
                     settings_$vhash.push(GoogleChartsConfig_$vhash[0].id);

diff --git a/eea/googlecharts/views/zpt/inline-includes.pt b/eea/googlecharts/views/zpt/inline-includes.pt
@@ -1,7 +1,7 @@
 <link href="++resource++eea.googlecharts.view.css" rel="stylesheet" type="text/css"/>
 <link href="++resource++eea.googlecharts.print.css" rel="stylesheet" type="text/css" media="print"/>
 
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
 <script type="text/javascript" src="++resource++json2.js"></script>
 <script type="text/javascript" src="++resource++eea.googlecharts.embed_common.js"></script>
 <script type="text/javascript" src="++resource++eea.googlecharts.chart.js"></script>