diff options
| author | XhmikosR <[email protected]> | 2020-05-13 21:53:43 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-13 21:53:43 +0300 |
| commit | de7af5ee0738d08ef2d6702654834beb5bfce35e (patch) | |
| tree | 371b751a7f96f96399e53d1767b8f0c4610cb268 /js/dist/scrollspy.js | |
| parent | 53eb7d38830f1e7c593069c8f5b40f4127563317 (diff) | |
| download | bootstrap-de7af5ee0738d08ef2d6702654834beb5bfce35e.tar.xz bootstrap-de7af5ee0738d08ef2d6702654834beb5bfce35e.zip | |
Dist (#30694)
Diffstat (limited to 'js/dist/scrollspy.js')
| -rw-r--r-- | js/dist/scrollspy.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/js/dist/scrollspy.js b/js/dist/scrollspy.js index b1114eb93..09944c209 100644 --- a/js/dist/scrollspy.js +++ b/js/dist/scrollspy.js @@ -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 |