From 8e568a8e3652e48e6af23c1aedce2b63dbd2fa9e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 23 May 2014 15:49:13 -0700 Subject: grunt dist --- dist/js/bootstrap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'dist/js/bootstrap.js') 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 -- cgit v1.2.3