move scripts to separate include so we can include them across layouts even if the...

diff --git a/_includes/footer.html b/_includes/footer.html
index a2f74e0707adef7e0eff78e27169bf885e0728d3..19b05996f2e76b54c9e0da5403b7aa3f808b4168 100644 (file)
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -10,54 +10,3 @@
     <p>Currently v{{ site.current_version }}. Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
   </div>
 </footer>
-
-<script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script>
-<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
-
-<script src="{{ site.baseurl }}/assets/js/vendor/popper.min.js"></script>
-
-{% if site.github %}
-  <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
-{% else %}
-  <script src="{{ site.baseurl }}/dist/js/bootstrap.js"></script>
-{% endif %}
-
-{% if site.github %}
-  <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
-{% else %}
-  <script src="{{ site.baseurl }}/assets/js/vendor/anchor.min.js"></script>
-  <script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script>
-  <script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script>
-  <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
-{% endif %}
-
-<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script>
-<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
-
-{% if page.layout == "docs" %}
-<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
-<script type="text/javascript">
-  var docsearch = docsearch({
-    apiKey: '48cb48b22351bc71ea5f12f4d1ede198',
-    indexName: 'bootstrap-v4',
-    inputSelector: '#search-input',
-    transformData: function (hits) {
-      return hits.map(function (hit) {
-        hit.url = hit.url.replace('https://v4-alpha.getbootstrap.com', '');
-        return hit;
-      });
-    },
-    debug: false // Set debug to true if you want to inspect the dropdown
-  });
-</script>
-{% endif %}
-
-<script>
-Holder.addTheme('gray', {
-  bg: '#777',
-  fg: 'rgba(255,255,255,.75)',
-  font: 'Helvetica',
-  fontweight: 'normal'
-})
-</script>

diff --git a/_includes/scripts.html b/_includes/scripts.html
new file mode 100644 (file)
index 0000000..a713f81
--- /dev/null
+++ b/_includes/scripts.html
@@ -0,0 +1,50 @@
+<script src="{{ site.cdn.jquery }}" integrity="{{ site.cdn.jquery_hash }}" crossorigin="anonymous"></script>
+<script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
+
+<script src="{{ site.baseurl }}/assets/js/vendor/popper.min.js"></script>
+
+{% if site.github %}
+  <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
+{% else %}
+  <script src="{{ site.baseurl }}/dist/js/bootstrap.js"></script>
+{% endif %}
+
+{% if site.github %}
+  <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
+{% else %}
+  <script src="{{ site.baseurl }}/assets/js/vendor/anchor.min.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
+{% endif %}
+
+<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script>
+<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
+
+{% if page.layout == "docs" %}
+<script type="text/javascript" src="https://cdn.jsdelivr.net/docsearch.js/2/docsearch.min.js"></script>
+<script type="text/javascript">
+  var docsearch = docsearch({
+    apiKey: '48cb48b22351bc71ea5f12f4d1ede198',
+    indexName: 'bootstrap-v4',
+    inputSelector: '#search-input',
+    transformData: function (hits) {
+      return hits.map(function (hit) {
+        hit.url = hit.url.replace('https://v4-alpha.getbootstrap.com', '');
+        return hit;
+      });
+    },
+    debug: false // Set debug to true if you want to inspect the dropdown
+  });
+</script>
+{% endif %}
+
+<script>
+Holder.addTheme('gray', {
+  bg: '#777',
+  fg: 'rgba(255,255,255,.75)',
+  font: 'Helvetica',
+  fontweight: 'normal'
+})
+</script>

diff --git a/_layouts/default.html b/_layouts/default.html
index e3642ac6d1a9cc996823779d67d5f818654f5c02..d5e6b10b4390a7c0544d7b62ad8ce0566b811d41 100644 (file)
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -17,5 +17,6 @@
     </main>
 
     {% include footer.html %}
+    {% include scripts.html %}
   </body>
 </html>

diff --git a/_layouts/docs.html b/_layouts/docs.html
index 7bbb06b87d247bf7ba7e247183c40eb48f0865c2..26ba91aae75215f2e9f5086a21b30b141ce3b071 100644 (file)
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -31,5 +31,7 @@
         {% endif %}
       </div>
     </div>
+
+    {% include scripts.html %}
   </body>
 </html>

diff --git a/_layouts/home.html b/_layouts/home.html
index 788ecf1dd558ff8f3418e57f982a7bad3a2c3284..64eabadb111c37bd905a906e54ae763929e36b36 100644 (file)
--- a/_layouts/home.html
+++ b/_layouts/home.html
@@ -15,5 +15,6 @@
     {{ content }}
 
     {% include footer.html %}
+    {% include scripts.html %}
   </body>
 </html>