Merge pull request #48 from rancher/sidenav-scroll-spy

fix jquery error on missing id
This commit is contained in:
Vincent Fiduccia
2018-04-29 17:15:21 -07:00
committed by GitHub
+13 -8
View File
@@ -231,20 +231,25 @@ const bootstrapScrollSpy = function () {
left: $el.offset().left,
};
console.log(scrollTop, $(window).height())
for (var i = 0; i <= $mainContentHeaders.length - 1; i++) {
var $mainContentHeadersEl = $(`#${$mainContentHeaders[i].id}`);
var hTop = $mainContentHeadersEl.offset().top;
if ($($mainContentHeaders[i]).attr('id')) {
var $mainContentHeadersEl = $(`#${$mainContentHeaders[i].id}`);
var hTop = $mainContentHeadersEl.offset().top;
if (hTop - scrollTop >= 0) {
if (hTop - scrollTop >= 0) {
$mainContentHeaders.each( ( i, a ) => {
$('#TableOfContents').find(`a[href$=${a.id}]`).removeClass('active');
});
$mainContentHeaders.each( ( i, a ) => {
if ($(a).attr('id')) {
$('#TableOfContents').find(`a[href$=${a.id}]`).removeClass('active');
}
});
$('#TableOfContents').find(`a[href$=${$mainContentHeaders[i].id}]`).addClass('active');
$('#TableOfContents').find(`a[href$=${$mainContentHeaders[i].id}]`).addClass('active');
break;
}
} else {
break;
}
}