Commit 4d866843 authored by Sli's avatar Sli

core: move jquery to header section

parent 4afd7a00
Pipeline #1658 passed with stage
in 12 minutes and 1 second
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
{% else %} {% else %}
<link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}"> <link rel="stylesheet" href="{{ static('core/font-awesome/css/font-awesome.min.css') }}">
{% endif %} {% endif %}
<!-- Jquery declared here to be accessible in every django widgets -->
<script src="{{ static('core/js/jquery-3.1.0.min.js') }}"></script>
{% endblock %} {% endblock %}
</head> </head>
...@@ -248,7 +251,6 @@ ...@@ -248,7 +251,6 @@
{% endblock %} {% endblock %}
--> -->
{% block script %} {% 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/jquery-ui.min.js') }}"></script>
<script src="{{ static('core/js/ui/i18n/datepicker-fr.js') }}"></script> <script src="{{ static('core/js/ui/i18n/datepicker-fr.js') }}"></script>
<script src="{{ static('core/js/jquery.datetimepicker.full.min.js') }}"></script> <script src="{{ static('core/js/jquery.datetimepicker.full.min.js') }}"></script>
......
...@@ -33,19 +33,13 @@ ...@@ -33,19 +33,13 @@
// Custom markdown parser // Custom markdown parser
function customMarkdownParser(plainText, preview) { function customMarkdownParser(plainText, preview) {
// Wait for jquery to load $.ajax({
var waitForJquery = setInterval(function () { url: "{{ markdown_api_url }}",
if (typeof $ != 'undefined'){ method: "POST",
clearInterval(waitForJquery) data: { text: plainText, csrfmiddlewaretoken: getCookie('csrftoken') },
$.ajax({ }).done(function (msg) {
url: "{{ markdown_api_url }}", preview.innerHTML = msg;
method: "POST", });
data: { text: plainText, csrfmiddlewaretoken: getCookie('csrftoken') },
}).done(function (msg) {
preview.innerHTML = msg;
});
}
}, 10);
} }
// Pretty markdown input // Pretty markdown input
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment