diff options
| author | Mark Otto <[email protected]> | 2017-05-29 10:52:13 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-05-29 23:32:28 -0700 |
| commit | 6ee35ced8650d65fbdbb5bbbe4575f53ae8fc801 (patch) | |
| tree | 81f20097a7ce6a06a9ac6e35a6acce4cad38fabf | |
| parent | 5c704d77ca917c318fe500b4b6513089fe22fa53 (diff) | |
| download | bootstrap-6ee35ced8650d65fbdbb5bbbe4575f53ae8fc801.tar.xz bootstrap-6ee35ced8650d65fbdbb5bbbe4575f53ae8fc801.zip | |
move scripts to separate include so we can include them across layouts even if the footer isn't there
| -rw-r--r-- | _includes/footer.html | 51 | ||||
| -rw-r--r-- | _includes/scripts.html | 50 | ||||
| -rw-r--r-- | _layouts/default.html | 1 | ||||
| -rw-r--r-- | _layouts/docs.html | 2 | ||||
| -rw-r--r-- | _layouts/home.html | 1 |
5 files changed, 54 insertions, 51 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index a2f74e070..19b05996f 100644 --- 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 index 000000000..a713f81d0 --- /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 e3642ac6d..d5e6b10b4 100644 --- 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 7bbb06b87..26ba91aae 100644 --- 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 788ecf1dd..64eabadb1 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -15,5 +15,6 @@ {{ content }} {% include footer.html %} + {% include scripts.html %} </body> </html> |
