]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
use non-minified Bootstrap JS when on non-gh-pages 14036/head
authorChris Rebert <code@rebertia.com>
Thu, 3 Jul 2014 20:28:30 +0000 (13:28 -0700)
committerChris Rebert <code@rebertia.com>
Thu, 3 Jul 2014 20:40:47 +0000 (13:40 -0700)
Gruntfile.js
docs/_includes/footer.html
docs/assets/js/vendor/ZeroClipboard.min.js [moved from docs/assets/js/_vendor/ZeroClipboard.min.js with 100% similarity]
docs/assets/js/vendor/blob.js [moved from docs/assets/js/_vendor/blob.js with 100% similarity]
docs/assets/js/vendor/filesaver.js [moved from docs/assets/js/_vendor/filesaver.js with 100% similarity]
docs/assets/js/vendor/holder.js [moved from docs/assets/js/_vendor/holder.js with 100% similarity]
docs/assets/js/vendor/jszip.min.js [moved from docs/assets/js/_vendor/jszip.min.js with 100% similarity]
docs/assets/js/vendor/less.min.js [moved from docs/assets/js/_vendor/less.min.js with 100% similarity]
docs/assets/js/vendor/uglify.min.js [moved from docs/assets/js/_vendor/uglify.min.js with 100% similarity]

index 3deaea424898dc663956a90b22033cfee2c0f39a..9a259f0fa4e7746a595741825ee3e55937a9c02a 100644 (file)
@@ -119,20 +119,21 @@ module.exports = function (grunt) {
       },
       customize: {
         src: [
-          'docs/assets/js/_vendor/less.min.js',
-          'docs/assets/js/_vendor/jszip.min.js',
-          'docs/assets/js/_vendor/uglify.min.js',
-          'docs/assets/js/_vendor/blob.js',
-          'docs/assets/js/_vendor/filesaver.js',
+          'docs/assets/js/vendor/less.min.js',
+          'docs/assets/js/vendor/jszip.min.js',
+          'docs/assets/js/vendor/uglify.min.js',
+          'docs/assets/js/vendor/blob.js',
+          'docs/assets/js/vendor/filesaver.js',
           'docs/assets/js/raw-files.min.js',
           'docs/assets/js/src/customizer.js'
         ],
         dest: 'docs/assets/js/customize.min.js'
       },
       docsJs: {
+        // NOTE: This src list is duplicated in footer.html; if making changes here, be sure to update the other copy too.
         src: [
-          'docs/assets/js/_vendor/holder.js',
-          'docs/assets/js/_vendor/ZeroClipboard.min.js',
+          'docs/assets/js/vendor/holder.js',
+          'docs/assets/js/vendor/ZeroClipboard.min.js',
           'docs/assets/js/src/application.js'
         ],
         dest: 'docs/assets/js/docs.min.js'
index cebd0ee7be819a10332372149a906ff671b87743..f962d19cc3212634284fd959204f1536af379c4a 100644 (file)
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+{% if site.github %}
 <script src="../dist/js/bootstrap.min.js"></script>
+{% else %}
+<script src="../dist/js/bootstrap.js"></script>
+{% endif %}
 {% if site.github %}
 <script src="../assets/js/docs.min.js"></script>
 {% else %}
+<script src="../assets/js/vendor/holder.js"></script>
+<script src="../assets/js/vendor/ZeroClipboard.min.js"></script>
 <script src="../assets/js/src/application.js"></script>
 {% endif %}
 {% if page.slug == "customize" %}