Merge pull request #40 from eea/develop

Refs #116244 fix chart loading on FF
collective · Mar 27, 2020 · a4a5baf · a4a5baf
2 parents 43b6bd8 + 555505c
commit a4a5baf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+20.2 - (2020-03-27)
+---------------------------
+* Change: load google charts api from loader.js instead of gsapi in order to
+  avoid a strange bug where FF doesn't trigger the setOnLoadCallback from google
+  [ichim-david refs #116244]
+
 20.1 - (2020-03-13)
 ---------------------------
 * Bug fix: save notes and datasource per chart when clicking on the chart tabs

diff --git a/eea/googlecharts/version.txt b/eea/googlecharts/version.txt
@@ -1 +1 @@
-20.1
+20.2
diff --git a/eea/googlecharts/views/zpt/embed-chart.pt b/eea/googlecharts/views/zpt/embed-chart.pt
@@ -28,7 +28,7 @@
         <meta property="og:title" tal:attributes="content string:${title}" />
         <script type="text/javascript" tal:attributes="src string:${portal_url}/${view/jquery_src}"></script>
         <script type="text/javascript" tal:define="resource_prefix python: '++resource++' if not eea_jqueryui else ''" tal:attributes="src string:${portal_url}/${resource_prefix}jquery-migrate.js"></script>
-        <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+        <script src="https://www.gstatic.com/charts/loader.js"></script>
         <title tal:content="title"></title>
     </head>
     <body onhashchange="hashchanged();" tal:attributes="class python:draft_class + ' isPrint' if isPrint else draft_class">

diff --git a/eea/googlecharts/views/zpt/embed-dashboard.pt b/eea/googlecharts/views/zpt/embed-dashboard.pt
@@ -29,7 +29,7 @@
 
   <script type="text/javascript" tal:attributes="src string:${portal_url}/${view/jquery_src}"></script>
   <script type="text/javascript" tal:define="resource_prefix python: '++resource++' if not eea_jqueryui else ''" tal:attributes="src string:${portal_url}/${resource_prefix}jquery-migrate.js"></script>
-  <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+  <script src="https://www.gstatic.com/charts/loader.js"></script>
 
 </head>
 <body onhashchange="hashchanged();" tal:attributes="class python:'isPrint' if isPrint else ''">