Merge branch 'master' of github.com:twbs/bootstrap

9d73d9c3 · fat · ce4a2e43 · ea40e799 · 9d73d9c3
Commit 9d73d9c3 authored 11 years ago by fat
Hide whitespace changes
Inline Side-by-side

Showing

with 1 addition and 0 deletions
+1 -0
--- 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] })