diff options
| author | fat <[email protected]> | 2013-12-29 17:54:40 -0800 |
|---|---|---|
| committer | fat <[email protected]> | 2013-12-29 17:54:40 -0800 |
| commit | 9d73d9c38c440b4863a991da7995a10ae1023b57 (patch) | |
| tree | d864ffcd84dd40064513ad8a450a7c7c90d50646 /js | |
| parent | ce4a2e435268a2eeb5578cbb4ff70bfaaed0eef9 (diff) | |
| parent | ea40e7999dfb72a34c3f06f615a6bcd7c1c045c1 (diff) | |
| download | bootstrap-9d73d9c38c440b4863a991da7995a10ae1023b57.tar.xz bootstrap-9d73d9c38c440b4863a991da7995a10ae1023b57.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'js')
| -rw-r--r-- | js/scrollspy.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/scrollspy.js b/js/scrollspy.js index 571dafbde..02054bdb8 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -51,6 +51,7 @@ 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] }) |