Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <jacobthornton@gmail.com>2011-12-22 05:38:05 +0400
committerJacob Thornton <jacobthornton@gmail.com>2011-12-22 05:38:05 +0400
commit6d5b5065176a9e46ce71ec5fc16ae4a079e9e636 (patch)
tree967bc54b6517b3858cadbfeb5084ccf818423ed7
parenta5a98a8a984512011dac1216b432b86c6eff96a4 (diff)
minor cleanups
-rw-r--r--Makefile11
-rw-r--r--js/bootstrap-collapse.js4
-rw-r--r--js/bootstrap-transition.js2
3 files changed, 10 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index e5c083ae6f..1f38338f80 100644
--- a/Makefile
+++ b/Makefile
@@ -22,15 +22,16 @@ build:
uglify:
@@if test ! -z ${UGLIFY_JS}; then \
mkdir -p js/min; \
- uglifyjs -o js/min/bootstrap-accordion.js js/bootstrap-accordion.js;\
- uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alerts.js;\
- uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-buttons.js;\
+ uglifyjs -o js/min/bootstrap-alerts.js js/bootstrap-alert.js;\
+ uglifyjs -o js/min/bootstrap-buttons.js js/bootstrap-button.js;\
+ uglifyjs -o js/min/bootstrap-carousel.js js/bootstrap-carousel.js;\
+ uglifyjs -o js/min/bootstrap-collapse.js js/bootstrap-collapse.js;\
uglifyjs -o js/min/bootstrap-dropdown.js js/bootstrap-dropdown.js;\
uglifyjs -o js/min/bootstrap-modal.js js/bootstrap-modal.js;\
uglifyjs -o js/min/bootstrap-popover.js js/bootstrap-popover.js;\
uglifyjs -o js/min/bootstrap-scrollspy.js js/bootstrap-scrollspy.js;\
- uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tabs.js;\
- uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transitions.js;\
+ uglifyjs -o js/min/bootstrap-tabs.js js/bootstrap-tab.js;\
+ uglifyjs -o js/min/bootstrap-transitions.js js/bootstrap-transition.js;\
uglifyjs -o js/min/bootstrap-twipsy.js js/bootstrap-twipsy.js;\
else \
echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index 313c0abcab..9301c7309d 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -17,7 +17,7 @@
* limitations under the License.
* ============================================================ */
-(function( $ ){
+!function( $ ){
"use strict"
@@ -132,4 +132,4 @@
})
})
-})( window.jQuery ) \ No newline at end of file
+}( window.jQuery ) \ No newline at end of file
diff --git a/js/bootstrap-transition.js b/js/bootstrap-transition.js
index 25f8b111f1..29fa1bdebc 100644
--- a/js/bootstrap-transition.js
+++ b/js/bootstrap-transition.js
@@ -19,6 +19,8 @@
$(function () {
+ "use strict"
+
/* CSS TRANSITION SUPPORT (https://gist.github.com/373874)
* ======================================================= */