From 205bf1c1df972d98fb7b6d7b14970c659b1d9a74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cornelius=20Mat=C4=9Bjka?= <donald.duck@mailbox.org>
Date: Mon, 6 Mar 2017 14:17:24 +0100
Subject: [PATCH 1/3] Added possibility to use gchart with its preferred
 library loading method. For compatibility reasons graphos supports both
 methods (loader.js and older jsapi).

---
 graphos/templates/graphos/gchart/base.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/graphos/templates/graphos/gchart/base.html b/graphos/templates/graphos/gchart/base.html
index 933e185..139b89a 100644
--- a/graphos/templates/graphos/gchart/base.html
+++ b/graphos/templates/graphos/gchart/base.html
@@ -1,6 +1,10 @@
 
 <script type="text/javascript">
-  google.setOnLoadCallback(drawChart{{ chart.get_html_id }});
+  if (typeof google.setOnLoadCallback !== 'undefined') {
+    google.setOnLoadCallback(drawChart{{ chart.get_html_id }});
+  } else {
+    google.charts.setOnLoadCallback(drawChart{{ chart.get_html_id }});
+  }
   function drawChart{{ chart.get_html_id }}() {
     {% block chart_specific_arraytodatatable %}
       var data = google.visualization.arrayToDataTable({{ chart.get_data_json|safe }});

From acdad204b0772b346a1bef5c30ba490390390de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cornelius=20Mat=C4=9Bjka?= <donald.duck@mailbox.org>
Date: Tue, 7 Mar 2017 12:31:33 +0100
Subject: [PATCH 2/3] Added warning when using old jsapi loader.

---
 graphos/templates/graphos/gchart/base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/graphos/templates/graphos/gchart/base.html b/graphos/templates/graphos/gchart/base.html
index 139b89a..74434ca 100644
--- a/graphos/templates/graphos/gchart/base.html
+++ b/graphos/templates/graphos/gchart/base.html
@@ -2,6 +2,7 @@
 <script type="text/javascript">
   if (typeof google.setOnLoadCallback !== 'undefined') {
     google.setOnLoadCallback(drawChart{{ chart.get_html_id }});
+    console.warn("This version of Google Charts loaded via the jsapi loader is no longer being updated. Please use the new gstatic loader (https://developers.google.com/chart/interactive/docs/basic_load_libs#update-library-loader-code).")
   } else {
     google.charts.setOnLoadCallback(drawChart{{ chart.get_html_id }});
   }

From 19700f6a4affcb467eb4f4dc204f94e73a06f0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cornelius=20Mat=C4=9Bjka?= <donald.duck@mailbox.org>
Date: Tue, 7 Mar 2017 12:43:26 +0100
Subject: [PATCH 3/3] Updated README.md gchart examples according to  the newer
 and preferred gstatic library loader.

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 7163398..11e1072 100644
--- a/README.md
+++ b/README.md
@@ -152,16 +152,16 @@ And then in the template:
 
 In this example we are planning to use Google chart, as is evident from the import statement in the view, we import gchart.LineChart. So we must also include the google chart javascript in our template.
 
-    <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">
-        google.load("visualization", "1", {packages:["corechart"]});
+      google.charts.load('current', {packages: ['corechart']});
     </script>
 
 So the template would look like
 
-    <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">
-        google.load("visualization", "1", {packages:["corechart"]});
+      google.charts.load('current', {packages: ['corechart']});
     </script>
 
     {{ chart.as_html }}
@@ -320,9 +320,9 @@ Most of the chart providers support LineChart, BarChart, ColumnChart and PieChar
 
 ##### Template
 
-    <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">
-        google.load("visualization", "1", {packages:["corechart"]});
+      google.charts.load('current', {packages: ['corechart']});
     </script>
 
     {{ chart.as_html }}
@@ -384,9 +384,9 @@ Most of the chart providers support LineChart, BarChart, ColumnChart and PieChar
 
 ##### Template
 
-    <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">
-        google.load("visualization", "1", {packages:["corechart"]});
+      google.charts.load('current', {packages: ['corechart']});
     </script>
     {{ chart.as_html }}