diff options
| author | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 22:19:23 -0700 |
| commit | dae1a68fb15be9015760df32e85d764ef092db44 (patch) | |
| tree | 23dbce03ca690c069a35b3577377bff9a06cf432 /dist/js/bootstrap.js | |
| parent | 216bc3d68b6a9016b3c5fdf90d82cbb291a28f96 (diff) | |
| parent | 643effe382bb12b4ff1460e9e1987948b1763990 (diff) | |
| download | bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.tar.xz bootstrap-dae1a68fb15be9015760df32e85d764ef092db44.zip | |
Merge branch 'master' into derp
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/_includes/components/navs.html
docs/_includes/css/images.html
docs/_includes/js/dropdowns.html
docs/_includes/js/tabs.html
docs/assets/css/docs.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index b6cb4f8d0..0550cb210 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1436,7 +1436,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 = typeof el.getBoundingClientRect == 'function' ? el.getBoundingClientRect() : null + var elRect = el.getBoundingClientRect ? el.getBoundingClientRect() : null var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var outerDims = isSvg ? {} : { |