aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2013-08-07 23:10:11 -0700
committerJacob Thornton <[email protected]>2013-08-07 23:10:11 -0700
commit89b69ed77035eeb9c0034534d75fdb2062f10d47 (patch)
tree99b1f65ee730de94e64b4992e5131f0432743b1e /js
parentb35b65d0b3689f7999be998411e632046548af6e (diff)
parentf3104a3e3b04c2817094ef8ebd351833a4ade420 (diff)
downloadbootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.tar.xz
bootstrap-89b69ed77035eeb9c0034534d75fdb2062f10d47.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts: _layouts/customize.html
Diffstat (limited to 'js')
-rw-r--r--js/popover.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/js/popover.js b/js/popover.js
index feee3308d..24b85715f 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -58,7 +58,13 @@
$tip.removeClass('fade top bottom left right in')
- $tip.find('.popover-title:empty').hide()
+ // Hide empty titles
+ //
+ // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+ // this manually by checking the contents.
+ if ($tip.find('.popover-title').html() === '') {
+ $tip.find('.popover-title').hide();
+ }
}
Popover.prototype.hasContent = function () {
@@ -75,7 +81,7 @@
o.content)
}
- Popover.prototype.arrow =function () {
+ Popover.prototype.arrow = function () {
return this.$arrow = this.$arrow || this.tip().find('.arrow')
}