mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-05 16:42:29 +03:00
Code Activity

Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top

Browse Source 
Conflicts:
	dist/js/bootstrap.min.js
This commit is contained in:
fat
2013-12-29 18:04:43 -08:00
parent 9d73d9c38c ed5dbf1b2b
commit 162d9e1776
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/scrollspy.js
+4
View File
@@ -74,6 +74,10 @@
return activeTarget != (i = targets.last()[0]) && this.activate(i)
}
if (activeTarget && scrollTop <= offsets[0]) {
return activeTarget != (i = targets[0]) && this.activate(i)
}
for (i = offsets.length; i--;) {
activeTarget != targets[i]
&& scrollTop >= offsets[i]