Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
2526c3fd
Commit
2526c3fd
authored
12 years ago
by
billy gates
Browse files
Options
Download
Plain Diff
Merge pull request #6118 from godric7/master
scrollSpy - add parent scrollTop to offset calculation
parents
a7eb9c29
8b959cac
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
js/bootstrap-scrollspy.js
+1
-1
js/bootstrap-scrollspy.js
with
1 addition
and
1 deletion
+1
-1
js/bootstrap-scrollspy.js
+
1
-
1
View file @
2526c3fd
...
...
@@ -59,7 +59,7 @@
,
$href
=
/^#
\w
/
.
test
(
href
)
&&
$
(
href
)
return
(
$href
&&
$href
.
length
&&
[[
$href
.
position
().
top
,
href
]]
)
||
null
&&
[[
$href
.
position
().
top
+
self
.
$scrollElement
.
scrollTop
()
,
href
]]
)
||
null
})
.
sort
(
function
(
a
,
b
)
{
return
a
[
0
]
-
b
[
0
]
})
.
each
(
function
()
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets