From cd60da87c03cd30fdd7cb35e3a1bd12402aa3277 Mon Sep 17 00:00:00 2001
From: Christopher Neugebauer <chrisjrn@gmail.com>
Date: Wed, 7 Jun 2017 15:24:24 -0700
Subject: [PATCH] jQuery et al now work

---
 pinaxcon/templates/_scripts.html  | 4 ++++
 pinaxcon/templates/site_base.html | 1 -
 static/js/site.js                 | 5 -----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pinaxcon/templates/_scripts.html b/pinaxcon/templates/_scripts.html
index b3cdce5..5e4ba92 100644
--- a/pinaxcon/templates/_scripts.html
+++ b/pinaxcon/templates/_scripts.html
@@ -1,6 +1,10 @@
 {% load compress %}
 {% load staticfiles %}
 
+<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
+
 {% compress js %}
+  <script src='{% static "bootstrap/javascripts/bootstrap.min.js" %}'></script>
   <script src='{% static "js/site.js" %}'></script>
 {% endcompress %}
diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index f551155..91e94fd 100644
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -46,7 +46,6 @@
 
 {% block scripts %}
     {% include "_scripts.html" %}
-    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
 {% endblock %}
 
 {% block extra_body_base %}
diff --git a/static/js/site.js b/static/js/site.js
index 844bff2..e67bf07 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');