diff options
| author | Chris Rebert <[email protected]> | 2014-05-23 15:49:13 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-05-23 15:49:13 -0700 |
| commit | 8e568a8e3652e48e6af23c1aedce2b63dbd2fa9e (patch) | |
| tree | 3aa109f65125c2ea39e87b71a550ea67620666fa /dist/js/bootstrap.js | |
| parent | 475dbe58b03c214d973d50ba1fb48fba325cfd85 (diff) | |
| download | bootstrap-8e568a8e3652e48e6af23c1aedce2b63dbd2fa9e.tar.xz bootstrap-8e568a8e3652e48e6af23c1aedce2b63dbd2fa9e.zip | |
grunt dist
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index f6654d9db..bee010d75 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1253,6 +1253,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re .detach() .css({ top: 0, left: 0, display: 'block' }) .addClass(placement) + .data('bs.' + this.type, this) this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) @@ -1722,7 +1723,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ScrollSpy.prototype.process = function () { var scrollTop = this.$scrollElement.scrollTop() + this.options.offset var scrollHeight = this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight) - var maxScroll = scrollHeight - this.$scrollElement.height() + var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height() var offsets = this.offsets var targets = this.targets var activeTarget = this.activeTarget |