make sure not to include jquery twice, fixes daattali#29

adamlamar · Jan 31, 2016 · 8904d0b · 8904d0b
1 parent 21387f1
commit 8904d0b
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html
@@ -4,12 +4,6 @@
   {% endfor %}
 {% endif %}
 
-{% if page.common-js %}
-  {% for js in page.common-js %}
-	<script src="{{ js | prepend: site.baseurl | replace: '//', '/' }}"></script>
-  {% endfor %}
-{% endif %}
-
 {% if page.ext-js %}
   {% for js in page.ext-js %}
 	<script src="{{ js }}"></script>
@@ -22,4 +16,19 @@
   {% endfor %}
 {% endif %}
 
-{% include google_analytics.html %}
+{% if page.common-js %}
+  {% for js in page.common-js %}
+    <!-- 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') {
+      	  document.write('<script src="{{ js | prepend: site.baseurl | replace: "//", "/" }}"></scr' + 'ipt>');
+      	}
+      </script>
+    {% else %}
+	<script src="{{ js | prepend: site.baseurl | replace: '//', '/' }}"></script>
+    {% endif %}
+  {% endfor %}
+{% endif %}
+
+{% include google_analytics.html %}