diff --git a/pinaxcon/templates/_scripts.html b/pinaxcon/templates/_scripts.html index b3cdce514c5d2343965ff1beb9d6dd423883687a..5e4ba92a29f971d2453cdac35cd3ae4878e07451 100644 --- a/pinaxcon/templates/_scripts.html +++ b/pinaxcon/templates/_scripts.html @@ -1,6 +1,10 @@ {% load compress %} {% load staticfiles %} + + + {% compress js %} + {% endcompress %} diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html index f5511555cd4b84e406a9b24b026c1462cb079ebe..91e94fd5db844a5d6c3346c422a82e86067a7c6f 100644 --- a/pinaxcon/templates/site_base.html +++ b/pinaxcon/templates/site_base.html @@ -46,7 +46,6 @@ {% block scripts %} {% include "_scripts.html" %} - {% endblock %} {% block extra_body_base %} diff --git a/static/js/site.js b/static/js/site.js index 844bff22ea393a85daac0c3a40c7d0aa808f7352..e67bf0734d95df001106e0abdc44601c2d971625 100644 --- a/static/js/site.js +++ b/static/js/site.js @@ -1,9 +1,4 @@ /* global window ace */ -window.jQuery = window.$ = require('jquery'); - -const $ = window.$; - -require('bootstrap'); const loadEditors = () => { const $editors = $('.modal-body textarea, #id_body, #id_comment, #id_message, #id_text, #id_abstract, #id_additional_notes, #id_content_override, #id_description, #id_biography');