diff options
| author | Johann <[email protected]> | 2017-03-19 01:42:11 +0100 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2017-03-18 17:42:11 -0700 |
| commit | f2f2e39a45039658c3ed7a39af834ca8dd802bdc (patch) | |
| tree | 3747de9cd02f4cfff15027a6a7cd39a13b2162ea /js | |
| parent | f2f805128508e82f0adc6e57b421dfb46d65a434 (diff) | |
| download | bootstrap-f2f2e39a45039658c3ed7a39af834ca8dd802bdc.tar.xz bootstrap-f2f2e39a45039658c3ed7a39af834ca8dd802bdc.zip | |
Fix getSelectorFromElement when # is a selector (#21615)
* Fix getSelectorFromElement when # is a selector
* Thanks to @vanduynslagerp remove regex to validate selector
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/util.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/js/src/util.js b/js/src/util.js index 515eba6d9..3c0d02251 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -112,13 +112,16 @@ const Util = (($) => { getSelectorFromElement(element) { let selector = element.getAttribute('data-target') - - if (!selector) { + if (!selector || selector === '#') { selector = element.getAttribute('href') || '' - selector = /^#[a-z]/i.test(selector) ? selector : null } - return selector + try { + const $selector = $(selector) + return $selector.length > 0 ? selector : null + } catch (error) { + return null + } }, reflow(element) { |