aboutsummaryrefslogtreecommitdiff
path: root/docs/dist/js/bootstrap.js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-08-23 12:19:36 -0700
committerMark Otto <[email protected]>2014-08-23 12:19:36 -0700
commit6a0eb4e6bd19c5a9ddd201fbd2accca54f9a7dc9 (patch)
tree335134bda2d05ed4698f80f91af5631a4c237958 /docs/dist/js/bootstrap.js
parent70a5b849e8e495679bc8943976f4e83c5f6a2511 (diff)
downloadbootstrap-6a0eb4e6bd19c5a9ddd201fbd2accca54f9a7dc9.tar.xz
bootstrap-6a0eb4e6bd19c5a9ddd201fbd2accca54f9a7dc9.zip
grunt
Diffstat (limited to 'docs/dist/js/bootstrap.js')
-rw-r--r--docs/dist/js/bootstrap.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js
index 003023142..ed3e96f36 100644
--- a/docs/dist/js/bootstrap.js
+++ b/docs/dist/js/bootstrap.js
@@ -1450,7 +1450,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var isBody = el.tagName == 'BODY'
var isSvg = window.SVGElement && el instanceof window.SVGElement
- var elRect = el.getBoundingClientRect ? el.getBoundingClientRect() : null
+ var elRect = el.getBoundingClientRect()
var elOffset = isBody ? { top: 0, left: 0 } : $element.offset()
var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
var outerDims = isSvg ? {} : {
@@ -1640,7 +1640,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var content = this.getContent()
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
- $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
+ $tip.find('.popover-content').children().detach().end()[ // we use append for html objects to maintain js events
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
](content)