aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Fenkart <[email protected]>2014-09-13 02:29:28 +0200
committerHeinrich Fenkart <[email protected]>2014-09-13 02:29:28 +0200
commita97db648817356623961f2d4aeb2bbfb80f5be37 (patch)
tree7c040571e854ca81435a2767ee07726598f4cbd4
parent40f889df2a07c4ae9953387fef15d7033e31c434 (diff)
parentd15444d15e0adc89cfa42bb7bdfcd8ce76f1881b (diff)
downloadbootstrap-a97db648817356623961f2d4aeb2bbfb80f5be37.tar.xz
bootstrap-a97db648817356623961f2d4aeb2bbfb80f5be37.zip
Merge pull request #14569 from twbs/scrollspy-ignore-invisible-targets
Scrollspy: ignore invisible list items
-rw-r--r--js/scrollspy.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/js/scrollspy.js b/js/scrollspy.js
index db2378787..841df1878 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -65,6 +65,7 @@
return ($href
&& $href.length
&& $href.is(':visible')
+ && $el.is(':visible')
&& [[$href[offsetMethod]().top + offsetBase, href]]) || null
})
.sort(function (a, b) { return a[0] - b[0] })