0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

add build script for minified files and allow elements to be returned to getContent and title in popovers

This commit is contained in:
Jacob Thornton 2011-11-20 21:36:26 -08:00
parent 47c7f655ac
commit 36a7eb3851
3 changed files with 27 additions and 3 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
.DS_Store .DS_Store
js/min

View File

@ -4,6 +4,7 @@ BOOTSTRAP = ./bootstrap.css
BOOTSTRAP_MIN = ./bootstrap.min.css BOOTSTRAP_MIN = ./bootstrap.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc` LESS_COMPESSOR ?= `which lessc`
UGLIFY_JS ?= `which uglifyjs`
WATCHR ?= `which watchr` WATCHR ?= `which watchr`
build: build:
@ -18,6 +19,24 @@ build:
echo "You can install it by running: npm install less -g"; \ echo "You can install it by running: npm install less -g"; \
fi fi
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-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-twipsy.js js/bootstrap-twipsy.js;\
else \
echo "You must have the UGLIFYJS minifier installed in order to minify Bootstrap's js."; \
echo "You can install it by running: npm install uglify-js -g"; \
fi
watch: watch:
@@if test ! -z ${WATCHR}; then \ @@if test ! -z ${WATCHR}; then \
echo "Watching less files..."; \ echo "Watching less files..."; \

View File

@ -36,8 +36,12 @@
setContent: function () { setContent: function () {
var $tip = this.tip() var $tip = this.tip()
$tip.find('.title')['html'](this.getTitle()) , title = this.getTitle()
$tip.find('.content > *')['html'](this.getContent()) , content = this.getContent()
$tip.find('.title')[ $.type(title) == 'object' ? 'append' : 'html' ](title)
$tip.find('.content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content)
$tip[0].className = 'popover' $tip[0].className = 'popover'
} }