klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-06-29 09:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: move jquery to header section

Browse Source
This commit is contained in:
Antoine Bartuccio 2018-12-18 13:54:53 +01:00
parent 4afd7a0023
commit 4d866843e1
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/templates/core/base.jinja
View File

@ -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 @@
{% 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>

20
core/templates/core/markdown_textarea.jinja
View File

@ -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