Revert markitup hacks

Now that django-markitup doesn't use inline JS any more. This was my testing commit for zsiciarz/django-markitup#26
CTPUG · Feb 1, 2018 · 7e0e5e3 · 7e0e5e3
1 parent 5ae3939
commit 7e0e5e3
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 38 deletions.
diff --git a/wafer/compare/templates/admin/wafer.compare/change_form.html b/wafer/compare/templates/admin/wafer.compare/change_form.html
@@ -14,7 +14,3 @@
         </li>
     {% endif %}
 {% endblock %}
-{% block footer %}
-{{ block.super }}
-<script src="{% static 'js/markitup.js' %}"></script>
-{% endblock %}
diff --git a/wafer/pages/templates/wafer.pages/page_form.html b/wafer/pages/templates/wafer.pages/page_form.html
@@ -8,7 +8,3 @@ <h1>{% trans "Edit Page" %}</h1>
 {% crispy form %}
 </section>
 {% endblock %}
-{% block extra_foot %}
-{{ block.super }}
-<script type="text/javascript" src="{% static 'js/markitup.js' %}"></script>
-{% endblock %}
diff --git a/wafer/settings.py b/wafer/settings.py
@@ -299,7 +299,7 @@
 MEDUSA_DEPLOY_DIR = os.path.join(project_root, 'static_mirror')
 
 MARKITUP_FILTER = ('markdown.markdown', {'safe_mode': True})
-JQUERY_URL = 'vendor/jquery/dist/jquery.min.js'
+JQUERY_URL = None
 SELECT2_USE_BUNDLED_JQUERY = False
 
 REST_FRAMEWORK = {

diff --git a/wafer/sponsors/templates/admin/sponsors/change_form.html b/wafer/sponsors/templates/admin/sponsors/change_form.html
diff --git a/wafer/static/js/markitup.js b/wafer/static/js/markitup.js
diff --git a/wafer/talks/templates/wafer.talks/talk_form.html b/wafer/talks/templates/wafer.talks/talk_form.html
@@ -24,7 +24,3 @@ <h1>{% trans "Talk Submission" %}</h1>
   {% endif %}
 </section>
 {% endblock %}
-{% block extra_foot %}
-{{ block.super }}
-<script type="text/javascript" src="{% static 'js/markitup.js' %}"></script>
-{% endblock %}
diff --git a/wafer/templates/markitup/editor.html b/wafer/templates/markitup/editor.html