diff options
| author | Tadeu Zagallo <[email protected]> | 2014-05-23 19:27:05 -0300 |
|---|---|---|
| committer | Heinrich Fenkart <[email protected]> | 2014-10-26 03:14:08 +0100 |
| commit | e8af21cc9db7941de217113cef5c7d1640dd86d5 (patch) | |
| tree | 18cdb036decc65cf1c3438440945855709b984d8 /js/scrollspy.js | |
| parent | 2c2564faefd99b044273f132275bb620b5eccb93 (diff) | |
| download | bootstrap-e8af21cc9db7941de217113cef5c7d1640dd86d5.tar.xz bootstrap-e8af21cc9db7941de217113cef5c7d1640dd86d5.zip | |
Clear scrollspy selection above first section
Closes #13563 by merging it.
Diffstat (limited to 'js/scrollspy.js')
| -rw-r--r-- | js/scrollspy.js | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/js/scrollspy.js b/js/scrollspy.js index db2378787..430b5d6aa 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -91,8 +91,9 @@ return activeTarget != (i = targets[targets.length - 1]) && this.activate(i) } - if (activeTarget && scrollTop <= offsets[0]) { - return activeTarget != (i = targets[0]) && this.activate(i) + if (activeTarget && scrollTop < offsets[0]) { + this.activeTarget = null + return this.clear() } for (i = offsets.length; i--;) { @@ -106,9 +107,7 @@ ScrollSpy.prototype.activate = function (target) { this.activeTarget = target - $(this.selector) - .parentsUntil(this.options.target, '.active') - .removeClass('active') + this.clear() var selector = this.selector + '[data-target="' + target + '"],' + @@ -127,6 +126,12 @@ active.trigger('activate.bs.scrollspy') } + ScrollSpy.prototype.clear = function () { + $(this.selector) + .parentsUntil(this.options.target, '.active') + .removeClass('active') + } + // SCROLLSPY PLUGIN DEFINITION // =========================== |