From 36a7eb3851855b608266f301a63b561ac316bca9 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Sun, 20 Nov 2011 21:36:26 -0800
Subject: [PATCH] add build script for minified files and allow elements to be
returned to getContent and title in popovers
---
.gitignore | 3 ++-
Makefile | 19 +++++++++++++++++++
js/bootstrap-popover.js | 8 ++++++--
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 496ee2ca6a..38ad090992 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+js/min
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 294f0ed72e..e5c083ae6f 100644
--- a/Makefile
+++ b/Makefile
@@ -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:
@@ -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..."; \
diff --git a/js/bootstrap-popover.js b/js/bootstrap-popover.js
index d0bd831317..934ab05453 100644
--- a/js/bootstrap-popover.js
+++ b/js/bootstrap-popover.js
@@ -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'
}
--
GitLab