diff options
| author | Mark Otto <[email protected]> | 2014-03-16 20:40:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-16 20:40:30 -0700 |
| commit | 43cf003f9a0648787ab0285ebec866b1a7263c8a (patch) | |
| tree | 2bad0d9df2593922a90d8c9ee19f4167d4d22264 /dist/js/bootstrap.js | |
| parent | c93c3714336ecefdb69b4dc7ebc40ea87eb40a36 (diff) | |
| download | bootstrap-43cf003f9a0648787ab0285ebec866b1a7263c8a.tar.xz bootstrap-43cf003f9a0648787ab0285ebec866b1a7263c8a.zip | |
Update gruntfile to point to new customizer nav, run grunt
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index b9ae0fc11..876b74289 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1894,8 +1894,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re var offsetTop = offset.top var offsetBottom = offset.bottom - if (this.affixed == 'top') position.top += scrollTop - if (typeof offset != 'object') offsetBottom = offsetTop = offset if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element) @@ -1923,7 +1921,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re .trigger($.Event(affixType.replace('affix', 'affixed'))) if (affix == 'bottom') { - this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() }) + this.$element.offset({ top: position.top }) } } |