Update to google chart library loads

vivo-project · Feb 10, 2021 · 2122254 · 2122254
1 parent a9ce8c7
commit 2122254
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 12 deletions.
diff --git a/...bapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/...bapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
@@ -23,7 +23,7 @@
             <#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
             <#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()>
 
-            <#assign googleJSAPI = "https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22imagesparkline%22%5D%7D%5D%7D">
+            <#assign googleJSAPI = "https://www.gstatic.com/charts/loader.js">
 
             <span id="sparklineHeading">${i18n().publications_in_vivo}</span>
 

diff --git a/...n/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/...n/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
@@ -271,7 +271,13 @@
 
                 }
 
-                drawCoauthorsSparklineVisualization(sparklineImgTD);
+                google.charts.load('current', {
+                    callback: function() {
+                        drawCoauthorsSparklineVisualization(sparklineImgTD)
+                    },
+                    packages: ['bar', 'corechart', 'table', 'imagesparkline']
+                });
+
             });
         </script>
 

diff --git a/...ebapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/...ebapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
 
 ${headScripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

diff --git a/...c/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/...c/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
@@ -273,8 +273,12 @@
                     table.prependTo('#${sparklineContainerID}');
 
                 }
-
-                drawCoInvestigatorsSparklineVisualization(sparklineImgTD);
+                google.charts.load('current', {
+                    callback: function() {
+                        drawCoInvestigatorsSparklineVisualization(sparklineImgTD)
+                    },
+                    packages: ['bar', 'corechart', 'table', 'imagesparkline']
+                });
             });
         </script>
 

diff --git a/...ain/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl b/...ain/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
 
 ${headScripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

diff --git a/...n/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl b/...n/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
 
 ${headScripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

diff --git a/.../src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/.../src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
@@ -267,7 +267,12 @@
                     table.prependTo('#${sparklineContainerID}');
                 }
 
-                drawGrantCountVisualization(sparklineImgTD);
+                google.charts.load('current', {
+                    callback: function() {
+                        drawGrantCountVisualization(sparklineImgTD)
+                    },
+                    packages: ['bar', 'corechart', 'table', 'imagesparkline']
+                });   
             });
         </script>
 

diff --git a/.../src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl b/.../src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
@@ -17,7 +17,7 @@
 <#assign egoCoAuthorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthors'>
 <#assign egoCoAuthorshipNetworkDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthor_network_download'>
 
-<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
+<#assign googleVisualizationAPI = 'https://www.gstatic.com/charts/loader.js'>
 <#assign coAuthorPersonLevelJavaScript = '${urls.base}/js/visualization/coauthorship/coauthorship-personlevel.js'>
 <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'>
 

diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
@@ -21,7 +21,7 @@
 
 <#assign coAuthorIcon = '${urls.images}/visualization/coauthorship/co_author_icon.png'>
 
-<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
+<#assign googleVisualizationAPI = 'https://www.gstatic.com/charts/loader.js'>
 <#assign coInvestigatorPersonLevelJavaScript = '${urls.base}/js/visualization/coPIship/coPIship-person-level.js'>
 <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'>
 

diff --git a/...plates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/...plates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
@@ -1,6 +1,6 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
-<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
 
 ${headScripts.add(googleJSAPI)}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

diff --git a/...bapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/...bapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
@@ -272,7 +272,12 @@
 
                 }
 
-                drawPubCountVisualization(sparklineImgTD);
+                google.charts.load('current', {
+                    callback: function() {
+                        drawPubCountVisualization(sparklineImgTD)
+                    },
+                    packages: ['bar', 'corechart', 'table', 'imagesparkline']
+                });
             });
         </script>