From 8111ae107a4e8c4f20470f73b349b771198caf08 Mon Sep 17 00:00:00 2001
From: Bartuccio Antoine <klmp200@klmp200.net>
Date: Thu, 20 Dec 2018 14:15:57 +0100
Subject: [PATCH] core: move centralized custom scripts on top of base.jinja
 and move getCookie inside

---
 core/static/core/js/script.js               | 19 +++++++++++++++++++
 core/templates/core/base.jinja              |  3 ++-
 core/templates/core/markdown_textarea.jinja | 19 -------------------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/core/static/core/js/script.js b/core/static/core/js/script.js
index 32644885..0fc49293 100644
--- a/core/static/core/js/script.js
+++ b/core/static/core/js/script.js
@@ -43,3 +43,22 @@ $( function() {
 function display_notif() {
     $('#header_notif').toggle().parent().toggleClass("white");
 }
+
+// You can't get the csrf token from the template in a widget
+// We get it from a cookie as a workaround, see this link
+// https://docs.djangoproject.com/en/2.0/ref/csrf/#ajax
+function getCookie(cname) {
+    var name = cname + "=";
+    var decodedCookie = decodeURIComponent(document.cookie);
+    var ca = decodedCookie.split(';');
+    for(var i = 0; i <ca.length; i++) {
+        var c = ca[i];
+        while (c.charAt(0) == ' ') {
+            c = c.substring(1);
+        }
+        if (c.indexOf(name) == 0) {
+            return c.substring(name.length, c.length);
+        }
+    }
+    return "";
+}
\ No newline at end of file
diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index fe7d03aa..311e91d0 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -19,6 +19,8 @@
 
         <!-- Jquery declared here to be accessible in every django widgets -->
         <script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>
+        <!-- Put here to always have acces to those functions on django widgets -->
+        <script src="{{ static('core/js/script.js') }}"></script>
         {% endblock %}
     </head>
 
@@ -257,7 +259,6 @@
         <script src="{{ static('core/js/multiple-select.js') }}"></script>
         <script src="{{ static('ajax_select/js/ajax_select.js') }}"></script>
         <script src="{{ url('javascript-catalog') }}"></script>
-        <script src="{{ static('core/js/script.js') }}"></script>
         <script>
 $('.select_single').multipleSelect({
     single: true,
diff --git a/core/templates/core/markdown_textarea.jinja b/core/templates/core/markdown_textarea.jinja
index 915d9557..6442afb8 100644
--- a/core/templates/core/markdown_textarea.jinja
+++ b/core/templates/core/markdown_textarea.jinja
@@ -13,25 +13,6 @@
 			document.head.innerHTML += '<link rel="stylesheet" href="' + css + '">';
 		}
 
-		// You can't get the csrf token from the template in a widget
-		// We get it from a cookie as a workaround, see this link
-		// https://docs.djangoproject.com/en/2.0/ref/csrf/#ajax
-		function getCookie(cname) {
-			var name = cname + "=";
-			var decodedCookie = decodeURIComponent(document.cookie);
-			var ca = decodedCookie.split(';');
-			for(var i = 0; i <ca.length; i++) {
-				var c = ca[i];
-				while (c.charAt(0) == ' ') {
-					c = c.substring(1);
-				}
-				if (c.indexOf(name) == 0) {
-					return c.substring(name.length, c.length);
-				}
-			}
-			return "";
-		}
-
 		// Custom markdown parser
 		function customMarkdownParser(plainText, preview) {
 			$.ajax({