diff options
| author | fat <[email protected]> | 2013-12-29 18:04:43 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-29 18:04:43 -0800 |
| commit | 162d9e1776ef55d741ffc80f8694c16c40de32ca (patch) | |
| tree | 640fc798a0fd8de15f0027f4690885c569f1f654 /dist/js/bootstrap.js | |
| parent | 9d73d9c38c440b4863a991da7995a10ae1023b57 (diff) | |
| parent | ed5dbf1b2b8187b6939ab10d75573118d346f970 (diff) | |
| download | bootstrap-162d9e1776ef55d741ffc80f8694c16c40de32ca.tar.xz bootstrap-162d9e1776ef55d741ffc80f8694c16c40de32ca.zip | |
Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top
Conflicts:
dist/js/bootstrap.min.js
Diffstat (limited to 'dist/js/bootstrap.js')
| -rw-r--r-- | dist/js/bootstrap.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index 4e15cf199..07e64d2d2 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -1572,6 +1572,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" return ($href && $href.length + && $href.is(':visible') && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null }) .sort(function (a, b) { return a[0] - b[0] }) @@ -1594,6 +1595,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" return activeTarget != (i = targets.last()[0]) && this.activate(i) } + if (activeTarget && scrollTop <= offsets[0]) { + debugger + return activeTarget != (i = targets.first()[0]) && this.activate(i) + } + for (i = offsets.length; i--;) { activeTarget != targets[i] && scrollTop >= offsets[i] |