From 4d866843e1cdbd26643c8ab9a9d49924e361401a Mon Sep 17 00:00:00 2001
From: Bartuccio Antoine <klmp200@klmp200.net>
Date: Tue, 18 Dec 2018 13:54:53 +0100
Subject: [PATCH] core: move jquery to header section

---
 core/templates/core/base.jinja              |  4 +++-
 core/templates/core/markdown_textarea.jinja | 20 +++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 2809b025..fe7d03aa 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -16,6 +16,9 @@
         {% else %}
           <link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}">
         {% endif %}
+
+        <!-- Jquery declared here to be accessible in every django widgets -->
+        <script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>
         {% endblock %}
     </head>
 
@@ -248,7 +251,6 @@
             {% endblock %}
         -->
         {% block script %}
-        <script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>
         <script src="{{ static('core/js/ui/jquery-ui.min.js') }}"></script>
         <script src="{{ static('core/js/ui/i18n/datepicker-fr.js') }}"></script>
         <script src="{{ static('core/js/jquery.datetimepicker.full.min.js') }}"></script>
diff --git a/core/templates/core/markdown_textarea.jinja b/core/templates/core/markdown_textarea.jinja
index 285b7f24..bbf43631 100644
--- a/core/templates/core/markdown_textarea.jinja
+++ b/core/templates/core/markdown_textarea.jinja
@@ -33,19 +33,13 @@
 
 		// Custom markdown parser
 		function customMarkdownParser(plainText, preview) {
-			// Wait for jquery to load
-			var waitForJquery = setInterval(function () {
-				if (typeof $ != 'undefined'){
-					clearInterval(waitForJquery)
-					$.ajax({
-						url: "{{ markdown_api_url }}",
-						method: "POST",
-						data: { text: plainText, csrfmiddlewaretoken: getCookie('csrftoken') },
-					}).done(function (msg) {
-						preview.innerHTML = msg;
-					});
-				}
-			}, 10);
+			$.ajax({
+				url: "{{ markdown_api_url }}",
+				method: "POST",
+				data: { text: plainText, csrfmiddlewaretoken: getCookie('csrftoken') },
+			}).done(function (msg) {
+				preview.innerHTML = msg;
+			});
 		}
 
 		// Pretty markdown input