diff options
| author | XhmikosR <[email protected]> | 2017-09-26 17:46:16 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-26 17:46:16 +0300 |
| commit | c090c79a709a84cb6e2bd5dbed6343ae49c861a1 (patch) | |
| tree | cadb5d1e7a94588047081bb8d8c4f92914aaf043 /js/src/scrollspy.js | |
| parent | 8e56145e45e9d58e23c5f339b6cac50e751e36a7 (diff) | |
| parent | 3eae92f1fec3c84acf38bd7e16a14eac48868334 (diff) | |
| download | bootstrap-c090c79a709a84cb6e2bd5dbed6343ae49c861a1.tar.xz bootstrap-c090c79a709a84cb6e2bd5dbed6343ae49c861a1.zip | |
Merge branch 'v4-dev' into btn-active
Diffstat (limited to 'js/src/scrollspy.js')
| -rw-r--r-- | js/src/scrollspy.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js index 70067c0b3..e8f0d3101 100644 --- a/js/src/scrollspy.js +++ b/js/src/scrollspy.js @@ -54,6 +54,7 @@ const ScrollSpy = (() => { ACTIVE : '.active', NAV_LIST_GROUP : '.nav, .list-group', NAV_LINKS : '.nav-link', + NAV_ITEMS : '.nav-item', LIST_ITEMS : '.list-group-item', DROPDOWN : '.dropdown', DROPDOWN_ITEMS : '.dropdown-item', @@ -264,6 +265,8 @@ const ScrollSpy = (() => { // Set triggered links parents as active // With both <ul> and <nav> markup a parent is the previous sibling of any nav ancestor $link.parents(Selector.NAV_LIST_GROUP).prev(`${Selector.NAV_LINKS}, ${Selector.LIST_ITEMS}`).addClass(ClassName.ACTIVE) + // Handle special case when .nav-link is inside .nav-item + $link.parents(Selector.NAV_LIST_GROUP).prev(Selector.NAV_ITEMS).children(Selector.NAV_LINKS).addClass(ClassName.ACTIVE) } $(this._scrollElement).trigger(Event.ACTIVATE, { |