diff options
| author | Bootstrap's Grunt bot <[email protected]> | 2015-04-27 18:30:49 +0000 |
|---|---|---|
| committer | Bootstrap's Grunt bot <[email protected]> | 2015-04-27 18:30:49 +0000 |
| commit | d87b7a037bbfa74fb75b6ab845803437991ec598 (patch) | |
| tree | fd87693c1699041ce9208ab6c9972a3bd071de8f /docs/dist/js/bootstrap.js | |
| parent | aa479892d5985939b005c7978023e05d124ae263 (diff) | |
| download | bootstrap-d87b7a037bbfa74fb75b6ab845803437991ec598.tar.xz bootstrap-d87b7a037bbfa74fb75b6ab845803437991ec598.zip | |
automatic `grunt dist`
[ci skip]
Diffstat (limited to 'docs/dist/js/bootstrap.js')
| -rw-r--r-- | docs/dist/js/bootstrap.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/docs/dist/js/bootstrap.js b/docs/dist/js/bootstrap.js index d2e117e04..18d59bb18 100644 --- a/docs/dist/js/bootstrap.js +++ b/docs/dist/js/bootstrap.js @@ -1437,13 +1437,12 @@ if (typeof jQuery === 'undefined') { if (autoPlace) { var orgPlacement = placement - var $container = this.options.container ? $(this.options.container) : this.$element.parent() - var containerDim = this.getPosition($container) + var viewportDim = this.getPosition(this.$viewport) - placement = placement == 'bottom' && pos.bottom + actualHeight > containerDim.bottom ? 'top' : - placement == 'top' && pos.top - actualHeight < containerDim.top ? 'bottom' : - placement == 'right' && pos.right + actualWidth > containerDim.width ? 'left' : - placement == 'left' && pos.left - actualWidth < containerDim.left ? 'right' : + placement = placement == 'bottom' && pos.bottom + actualHeight > viewportDim.bottom ? 'top' : + placement == 'top' && pos.top - actualHeight < viewportDim.top ? 'bottom' : + placement == 'right' && pos.right + actualWidth > viewportDim.width ? 'left' : + placement == 'left' && pos.left - actualWidth < viewportDim.left ? 'right' : placement $tip |