From 0161ad672f3b0309ff6ecd0608add727b4b5e1e7 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Mon, 10 Jun 2019 14:33:36 +0100
Subject: Use tojson instead of safe

---
 app/templates/admin/annotations_by_dataset.html | 4 ++--
 app/templates/annotate/index.html               | 2 +-
 app/templates/demo/evaluate.html                | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'app/templates')

diff --git a/app/templates/admin/annotations_by_dataset.html b/app/templates/admin/annotations_by_dataset.html
index a0e935b..3885d7f 100644
--- a/app/templates/admin/annotations_by_dataset.html
+++ b/app/templates/admin/annotations_by_dataset.html
@@ -16,8 +16,8 @@
   <script src="{{ url_for('static', filename='js/makeChart.js') }}"></script>
   <script>adminViewAnnotations(
     '#graph',
-    {{ data.chart_data | safe }},
-    {{ data.annotations | safe }}
+    {{ data.chart_data | tojson }},
+    {{ data.annotations | tojson }}
     );
   </script>
 {% endblock scripts %}
diff --git a/app/templates/annotate/index.html b/app/templates/annotate/index.html
index 3b00b75..61233a8 100644
--- a/app/templates/annotate/index.html
+++ b/app/templates/annotate/index.html
@@ -55,7 +55,7 @@
   <script src="{{ url_for('static', filename='js/makeChart.js') }}"></script>
   <script src="{{ url_for('static', filename='js/updateTable.js') }}"></script>
   <script src="{{ url_for('static', filename='js/buttons.js') }}"></script>
-  <script>annotateChart("#graph", {{ data.chart_data | safe }});</script>
+  <script>annotateChart("#graph", {{ data.chart_data | tojson }});</script>
   <script>
     // reset button
     var reset = document.getElementById("btn-reset");
diff --git a/app/templates/demo/evaluate.html b/app/templates/demo/evaluate.html
index 7f63033..225dade 100644
--- a/app/templates/demo/evaluate.html
+++ b/app/templates/demo/evaluate.html
@@ -36,15 +36,15 @@
 <script src="{{ url_for('static', filename='js/makeChart.js') }}"></script>
 <script>viewAnnotations(
 	"#graph_user",
-	{{ data.chart_data | safe }},
-	{{ annotations_user | safe }}
+	{{ data.chart_data | tojson }},
+	{{ annotations_user | tojson }}
 );
 </script>
 <script>
   viewAnnotations(
 	"#graph_true",
-	{{ data.chart_data | safe }},
-	{{ annotations_true | safe }}
+	{{ data.chart_data | tojson }},
+	{{ annotations_true | tojson }}
 );
 </script>
 {% endblock %}
-- 
cgit v1.2.3