1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-08 14:46:34 +02:00
This commit is contained in:
XhmikosR
2020-05-13 21:53:43 +03:00
committed by GitHub
parent 53eb7d3883
commit de7af5ee07
56 changed files with 3476 additions and 4263 deletions

10
js/dist/scrollspy.js vendored
View File

@@ -277,9 +277,9 @@
;
_proto._getConfig = function _getConfig(config) {
config = _objectSpread2({}, Default, {}, typeof config === 'object' && config ? config : {});
config = _objectSpread2(_objectSpread2({}, Default), typeof config === 'object' && config ? config : {});
if (typeof config.target !== 'string') {
if (typeof config.target !== 'string' && isElement(config.target)) {
var id = config.target.id;
if (!id) {
@@ -335,9 +335,7 @@
return;
}
var offsetLength = this._offsets.length;
for (var i = offsetLength; i--;) {
for (var i = this._offsets.length; i--;) {
var isActiveTarget = this._activeTarget !== this._targets[i] && scrollTop >= this._offsets[i] && (typeof this._offsets[i + 1] === 'undefined' || scrollTop < this._offsets[i + 1]);
if (isActiveTarget) {
@@ -358,7 +356,7 @@
var link = SelectorEngine.findOne(queries.join(','));
if (link.classList.contains(CLASS_NAME_DROPDOWN_ITEM)) {
SelectorEngine.findOne(SELECTOR_DROPDOWN_TOGGLE, SelectorEngine.closest(link, SELECTOR_DROPDOWN)).classList.add(CLASS_NAME_ACTIVE);
SelectorEngine.findOne(SELECTOR_DROPDOWN_TOGGLE, link.closest(SELECTOR_DROPDOWN)).classList.add(CLASS_NAME_ACTIVE);
link.classList.add(CLASS_NAME_ACTIVE);
} else {
// Set triggered link as active