kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

enforce element check on scrollspy target (#30747)

Browse source
This commit is contained in:
Johann-S 2020-05-06 06:30:43 +02:00 • committed by GitHub
parent 122c99ebeb
commit f91788548c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
js/src/scrollspy.js
View file

@ -9,6 +9,7 @@ import {
getjQuery, getjQuery,
getSelectorFromElement, getSelectorFromElement,
getUID, getUID,
isElement,
typeCheckConfig typeCheckConfig
} from './util/index' } from './util/index'
import Data from './dom/data' import Data from './dom/data'
@ -168,7 +169,7 @@ class ScrollSpy {
...typeof config === 'object' && config ? config : {} ...typeof config === 'object' && config ? config : {}
} }
if (typeof config.target !== 'string') { if (typeof config.target !== 'string' && isElement(config.target)) {
let { id } = config.target let { id } = config.target
if (!id) { if (!id) {
id = getUID(NAME) id = getUID(NAME)

2
site/content/docs/4.3/components/scrollspy.md
View file

@ -324,7 +324,7 @@ Options can be passed via data attributes or JavaScript. For data attributes, ap
</tr> </tr>
<tr> <tr>
<td>target</td> <td>target</td>
<td>string</td> <td>string | jQuery object | DOM element</td>
<td></td> <td></td>
<td>Specifies element to apply Scrollspy plugin.</td> <td>Specifies element to apply Scrollspy plugin.</td>
</tr> </tr>