Merge upstream
This commit is contained in:
@@ -9,9 +9,9 @@
|
||||
<!-- doing something a bit funky here because I want to be careful not to include JQuery twice! -->
|
||||
{% if js contains 'jquery' %}
|
||||
<script>
|
||||
if (typeof jQuery == 'undefined') {
|
||||
if (typeof jQuery == 'undefined') {
|
||||
document.write('<script src="{{ js | relative_url }}"></scr' + 'ipt>');
|
||||
}
|
||||
}
|
||||
</script>
|
||||
{% else %}
|
||||
<script src="{{ js | relative_url }}"></script>
|
||||
@@ -19,12 +19,6 @@
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{% if site.site-js %}
|
||||
{% for js in site.site-js %}
|
||||
<script src="{{ js | relative_url }}"></script>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
{% if page.ext-js %}
|
||||
{% for js in page.ext-js %}
|
||||
{% include ext-js.html js=js %}
|
||||
|
||||
Reference in New Issue
Block a user