diff options
| author | Chris Rebert <[email protected]> | 2014-07-03 13:28:30 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-07-03 13:40:47 -0700 |
| commit | 1dc54dc160d4352d894550c7c5d3f68c475ba2cf (patch) | |
| tree | ec2500221862eaa8efd9ba89523e634676652591 | |
| parent | 92fd25a2a29dbef6b47ba932e9ba836150b93eeb (diff) | |
| download | bootstrap-1dc54dc160d4352d894550c7c5d3f68c475ba2cf.tar.xz bootstrap-1dc54dc160d4352d894550c7c5d3f68c475ba2cf.zip | |
use non-minified Bootstrap JS when on non-gh-pages
| -rw-r--r-- | Gruntfile.js | 15 | ||||
| -rw-r--r-- | docs/_includes/footer.html | 6 | ||||
| -rw-r--r-- | docs/assets/js/vendor/ZeroClipboard.min.js (renamed from docs/assets/js/_vendor/ZeroClipboard.min.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/blob.js (renamed from docs/assets/js/_vendor/blob.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/filesaver.js (renamed from docs/assets/js/_vendor/filesaver.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/holder.js (renamed from docs/assets/js/_vendor/holder.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/jszip.min.js (renamed from docs/assets/js/_vendor/jszip.min.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/less.min.js (renamed from docs/assets/js/_vendor/less.min.js) | 0 | ||||
| -rw-r--r-- | docs/assets/js/vendor/uglify.min.js (renamed from docs/assets/js/_vendor/uglify.min.js) | 0 |
9 files changed, 14 insertions, 7 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 3deaea424..9a259f0fa 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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' diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index cebd0ee7b..f962d19cc 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -33,10 +33,16 @@ ================================================== --> <!-- 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" %} diff --git a/docs/assets/js/_vendor/ZeroClipboard.min.js b/docs/assets/js/vendor/ZeroClipboard.min.js index 564023407..564023407 100644 --- a/docs/assets/js/_vendor/ZeroClipboard.min.js +++ b/docs/assets/js/vendor/ZeroClipboard.min.js diff --git a/docs/assets/js/_vendor/blob.js b/docs/assets/js/vendor/blob.js index 4bdfd4409..4bdfd4409 100644 --- a/docs/assets/js/_vendor/blob.js +++ b/docs/assets/js/vendor/blob.js diff --git a/docs/assets/js/_vendor/filesaver.js b/docs/assets/js/vendor/filesaver.js index 6095017e9..6095017e9 100644 --- a/docs/assets/js/_vendor/filesaver.js +++ b/docs/assets/js/vendor/filesaver.js diff --git a/docs/assets/js/_vendor/holder.js b/docs/assets/js/vendor/holder.js index d2fe17fea..d2fe17fea 100644 --- a/docs/assets/js/_vendor/holder.js +++ b/docs/assets/js/vendor/holder.js diff --git a/docs/assets/js/_vendor/jszip.min.js b/docs/assets/js/vendor/jszip.min.js index 54b6a09e9..54b6a09e9 100644 --- a/docs/assets/js/_vendor/jszip.min.js +++ b/docs/assets/js/vendor/jszip.min.js diff --git a/docs/assets/js/_vendor/less.min.js b/docs/assets/js/vendor/less.min.js index 3cecd957d..3cecd957d 100644 --- a/docs/assets/js/_vendor/less.min.js +++ b/docs/assets/js/vendor/less.min.js diff --git a/docs/assets/js/_vendor/uglify.min.js b/docs/assets/js/vendor/uglify.min.js index 3b6805eb5..3b6805eb5 100644 --- a/docs/assets/js/_vendor/uglify.min.js +++ b/docs/assets/js/vendor/uglify.min.js |
