1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-15 18:14:17 +02:00

fix(util): use getElementById when it's possible

This commit is contained in:
Johann-S
2018-08-07 18:37:46 +02:00
parent ae53690ab4
commit 6b92321f6a
2 changed files with 22 additions and 2 deletions

View File

@@ -77,12 +77,20 @@ const Util = (($) => {
getSelectorFromElement(element) {
let selector = element.getAttribute('data-target')
let method = 'querySelector'
if (!selector || selector === '#') {
selector = element.getAttribute('href') || ''
selector = (element.getAttribute('href') || '').trim()
}
const validSelector = selector
if (selector.charAt(0) === '#') {
selector = selector.substr(1)
method = 'getElementById'
}
try {
return document.querySelector(selector) ? selector : null
return document[method](selector) ? validSelector : null
} catch (err) {
return null
}