From 9197b79d9d4d96ca6e2e935814ca92079bd71791 Mon Sep 17 00:00:00 2001
From: Dean Attali <daattali@gmail.com>
Date: Thu, 4 Feb 2016 16:40:56 -0800
Subject: [PATCH] update footer scripts to try to fix bug; related to #33

---
 _includes/footer-scripts.html | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/_includes/footer-scripts.html b/_includes/footer-scripts.html
index 9e02b3a..e8da1e8 100644
--- a/_includes/footer-scripts.html
+++ b/_includes/footer-scripts.html
@@ -1,21 +1,32 @@
-<!-- TODO hardcode the required JS because on 2016-02-01 GitHub pages migrated to jekyll 3 and broke this template -->
-<script src="/js/jquery-1.11.2.min.js"></script>
-<script src="/js/bootstrap.min.js"></script>
-<script src="/js/main.js"></script>
-<!-- end TODO -->
+<!-- everything has to be repeated twice because on 2016-02-01 GitHub pages migrated to jekyll 3; see bug https://github.com/jekyll/jekyll/issues/4439 -->
 
+{% if page.common-ext-js %}
+  {% for js in page.common-ext-js %}
+	<script src="{{ js }}"></script>
+  {% endfor %}
+{% endif %}
 {% if layout.common-ext-js %}
   {% for js in layout.common-ext-js %}
 	<script src="{{ js }}"></script>
   {% endfor %}
 {% endif %}
 
+{% if page.ext-js %}
+  {% for js in page.ext-js %}
+	<script src="{{ js }}"></script>
+  {% endfor %}
+{% endif %}
 {% if layout.ext-js %}
   {% for js in layout.ext-js %}
 	<script src="{{ js }}"></script>
   {% endfor %}
 {% endif %}
 
+{% if page.js %}
+  {% for js in page.js %}
+	<script src="{{ js | prepend: site.baseurl | replace: '//', '/' }}"></script>
+  {% endfor %}
+{% endif %}
 {% if layout.js %}
   {% for js in layout.js %}
 	<script src="{{ js | prepend: site.baseurl | replace: '//', '/' }}"></script>
@@ -36,5 +47,19 @@
     {% endif %}
   {% endfor %}
 {% endif %}
+{% 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 %}