]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Docs: Separate Tether out from docs.min.js 18283/head 18284/head
authorChris Rebert <code@chrisrebert.com>
Thu, 19 Nov 2015 09:00:35 +0000 (01:00 -0800)
committerChris Rebert <code@chrisrebert.com>
Thu, 19 Nov 2015 09:04:34 +0000 (01:04 -0800)
We can't include it in docs.min.js because docs.min.js includes application.js,
application.js depends on bootstrap.js,
and the tooltip portion of bootstrap.js depends on Tether.

So instead, we need to load Tether separately before bootstrap.js

[skip sauce]

docs/_includes/footer.html
grunt/configBridge.json

index 34b463900021b1e4970248bf57641e83e965a4d6..3782eea04bcc6c05f331d33bd487c104a4b4b650 100644 (file)
@@ -14,6 +14,8 @@
 <script src="{{ site.cdn.jquery }}"></script>
 <script>window.jQuery || document.write('<script src="{{ site.baseurl }}/assets/js/vendor/jquery.min.js"><\/script>')</script>
 
+<script src="{{ site.baseurl }}/assets/js/vendor/tether.min.js"></script>
+
 {% if site.github %}
   <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
 {% else %}
index 7b965bbb5d66c0db5afeec959cb4e2b286e4c337..2bda83394375e8b8b7ca022db0a2144e508fa060 100644 (file)
@@ -4,7 +4,6 @@
       "../assets/js/vendor/anchor.min.js",
       "../assets/js/vendor/clipboard.min.js",
       "../assets/js/vendor/holder.min.js",
-      "../assets/js/vendor/tether.min.js",
       "../assets/js/src/application.js"
     ]
   }