From 1dc54dc160d4352d894550c7c5d3f68c475ba2cf Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Thu, 3 Jul 2014 13:28:30 -0700
Subject: [PATCH] use non-minified Bootstrap JS when on non-gh-pages
---
Gruntfile.js | 15 ++++++++-------
docs/_includes/footer.html | 6 ++++++
.../js/{_vendor => vendor}/ZeroClipboard.min.js | 0
docs/assets/js/{_vendor => vendor}/blob.js | 0
docs/assets/js/{_vendor => vendor}/filesaver.js | 0
docs/assets/js/{_vendor => vendor}/holder.js | 0
docs/assets/js/{_vendor => vendor}/jszip.min.js | 0
docs/assets/js/{_vendor => vendor}/less.min.js | 0
docs/assets/js/{_vendor => vendor}/uglify.min.js | 0
9 files changed, 14 insertions(+), 7 deletions(-)
rename docs/assets/js/{_vendor => vendor}/ZeroClipboard.min.js (100%)
rename docs/assets/js/{_vendor => vendor}/blob.js (100%)
rename docs/assets/js/{_vendor => vendor}/filesaver.js (100%)
rename docs/assets/js/{_vendor => vendor}/holder.js (100%)
rename docs/assets/js/{_vendor => vendor}/jszip.min.js (100%)
rename docs/assets/js/{_vendor => vendor}/less.min.js (100%)
rename docs/assets/js/{_vendor => vendor}/uglify.min.js (100%)
diff --git a/Gruntfile.js b/Gruntfile.js
index 3deaea4248..9a259f0fa4 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 cebd0ee7be..f962d19cc3 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
similarity index 100%
rename from docs/assets/js/_vendor/ZeroClipboard.min.js
rename to docs/assets/js/vendor/ZeroClipboard.min.js
diff --git a/docs/assets/js/_vendor/blob.js b/docs/assets/js/vendor/blob.js
similarity index 100%
rename from docs/assets/js/_vendor/blob.js
rename to docs/assets/js/vendor/blob.js
diff --git a/docs/assets/js/_vendor/filesaver.js b/docs/assets/js/vendor/filesaver.js
similarity index 100%
rename from docs/assets/js/_vendor/filesaver.js
rename to docs/assets/js/vendor/filesaver.js
diff --git a/docs/assets/js/_vendor/holder.js b/docs/assets/js/vendor/holder.js
similarity index 100%
rename from docs/assets/js/_vendor/holder.js
rename to docs/assets/js/vendor/holder.js
diff --git a/docs/assets/js/_vendor/jszip.min.js b/docs/assets/js/vendor/jszip.min.js
similarity index 100%
rename from docs/assets/js/_vendor/jszip.min.js
rename to 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
similarity index 100%
rename from docs/assets/js/_vendor/less.min.js
rename to 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
similarity index 100%
rename from docs/assets/js/_vendor/uglify.min.js
rename to docs/assets/js/vendor/uglify.min.js
--
GitLab