rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-07-04 13:14:06 +00:00
Code Issues Releases Wiki Activity

Merge branch 'js_fix_load_order' into 'dev'

Browse source 
Fix JavaScript not being load before the code using it.

See merge request federez/re2o!305
This commit is contained in:
chirac 2018-09-24 17:21:07 +02:00
parent 1703d79bd8 b6e4344893
commit a6f65fd967
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
templates/base.html
View file

@ -41,6 +41,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<meta property="og:image:alt" content="The Re2o logo"/> <meta property="og:image:alt" content="The Re2o logo"/>
<meta property="og:description" content="{% trans "Networking managing website endorsed by FedeRez." %}" /> <meta property="og:description" content="{% trans "Networking managing website endorsed by FedeRez." %}" />
{# Preload JavaScript #}
{% bootstrap_javascript %}
<script src="/static/js/typeahead/typeahead.js"></script>
<script src="/static/js/bootstrap-tokenfield/bootstrap-tokenfield.js"></script>
{# Load CSS #} {# Load CSS #}
{% bootstrap_css %} {% bootstrap_css %}
<link href="{% static 'css/typeaheadjs.css' %}" rel="stylesheet"> <link href="{% static 'css/typeaheadjs.css' %}" rel="stylesheet">
@ -265,8 +270,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</footer> </footer>
{# Load JavaScript #} {# Load JavaScript #}
{% bootstrap_javascript %}
<script src="/static/js/typeahead/typeahead.js"></script>
<script src="/static/js/handlebars/handlebars.js"></script> <script src="/static/js/handlebars/handlebars.js"></script>
<script src="/static/js/konami/konami.js"></script> <script src="/static/js/konami/konami.js"></script>
<script src="/static/js/sapphire.js"></script> <script src="/static/js/sapphire.js"></script>
@ -275,7 +278,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
let s = Sapphire(); let s = Sapphire();
Konami(s.activate); Konami(s.activate);
</script> </script>
<script src="/static/js/bootstrap-tokenfield/bootstrap-tokenfield.js"></script>
<script src="/static/js/shortcuts.js"></script> <script src="/static/js/shortcuts.js"></script>
{# Read the documentation for more information #} {# Read the documentation for more information #}