aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-02-24 22:17:36 -0800
committerJacob Thornton <[email protected]>2012-02-24 22:17:36 -0800
commit43760eb2029c73b6be6b0dbeb753be1e247697d9 (patch)
treeaf501404721f52023cd94140e9a0c6b042449a81
parentfb74018ae293588db84c6fbf2f4f07aa4da21c5e (diff)
downloadbootstrap-43760eb2029c73b6be6b0dbeb753be1e247697d9.tar.xz
bootstrap-43760eb2029c73b6be6b0dbeb753be1e247697d9.zip
fix for @pamelafox and #1861
-rw-r--r--docs/assets/bootstrap.zipbin54565 -> 54565 bytes
-rw-r--r--js/bootstrap-tooltip.js2
2 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index fd5b621d7..a61ae844d 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index d76e51e8c..e7bfd09bf 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -206,7 +206,7 @@
title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
- title = title.toString().replace(/(^\s*|\s*$)/, "")
+ title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title
}