Skip to content

Commit

Permalink
add build script for minified files and allow elements to be returned…
Browse files Browse the repository at this point in the history
… to getContent and title in popovers
  • Loading branch information
fat committed Nov 21, 2011
1 parent 47c7f65 commit 36a7eb3
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
.DS_Store
js/min
19 changes: 19 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ BOOTSTRAP = ./bootstrap.css
BOOTSTRAP_MIN = ./bootstrap.min.css
BOOTSTRAP_LESS = ./lib/bootstrap.less
LESS_COMPESSOR ?= `which lessc`
UGLIFY_JS ?= `which uglifyjs`
WATCHR ?= `which watchr`

build:
Expand All @@ -18,6 +19,24 @@ build:
echo "You can install it by running: npm install less -g"; \
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:
@@if test ! -z ${WATCHR}; then \
echo "Watching less files..."; \
Expand Down
8 changes: 6 additions & 2 deletions js/bootstrap-popover.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@

setContent: function () {
var $tip = this.tip()
$tip.find('.title')['html'](this.getTitle())
$tip.find('.content > *')['html'](this.getContent())
, title = this.getTitle()
, 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'
}

Expand Down

0 comments on commit 36a7eb3

Please sign in to comment.