aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorfat <[email protected]>2013-07-25 21:49:19 -0700
committerfat <[email protected]>2013-07-25 21:49:19 -0700
commit124d7e6279e34cfd6480a9f33f934aaba93b9dde (patch)
tree21c85873e84b1837b933af11c7fccf0a9f44512a /Makefile
parent0190128ebc40c362dc618e2d4fcf52fa47b21a1d (diff)
downloadbootstrap-124d7e6279e34cfd6480a9f33f934aaba93b9dde.tar.xz
bootstrap-124d7e6279e34cfd6480a9f33f934aaba93b9dde.zip
fixes #8560
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 97f11a37e..45fdd38bc 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ build:
@cp js/tests/vendor/jquery.js assets/js/
@echo " ${CHECK}"
@printf "Compiling and minifying JavaScript..."
- @cat js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js
+ @echo "if (!jQuery) throw new Error(\"Bootstrap requires jQuery\")\n" | cat - js/transition.js js/alert.js js/button.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/tooltip.js js/popover.js js/scrollspy.js js/tab.js js/affix.js > dist/js/bootstrap.js
@uglifyjs -nc dist/js/bootstrap.js > dist/js/bootstrap.min.tmp.js
@echo "/**\n* Bootstrap.js v3.0.0 by @fat & @mdo\n* Copyright 2013 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > dist/js/copyright.js
@cat dist/js/copyright.js dist/js/bootstrap.min.tmp.js > dist/js/bootstrap.min.js