diff options
| author | Mark Otto <[email protected]> | 2018-09-17 12:34:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2018-09-17 12:34:34 -0700 |
| commit | b68ea572da7b16232b04820bfa1035c506af8bb2 (patch) | |
| tree | e33670e98e1011e19925bbdae3b9cf7cbc9a5b92 /js/dist/util.js | |
| parent | 928ebd89254300aee284fc78b84c8a57de188d71 (diff) | |
| download | bootstrap-b68ea572da7b16232b04820bfa1035c506af8bb2.tar.xz bootstrap-b68ea572da7b16232b04820bfa1035c506af8bb2.zip | |
dist
Diffstat (limited to 'js/dist/util.js')
| -rw-r--r-- | js/dist/util.js | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/js/dist/util.js b/js/dist/util.js index 9cd6744d2..7342e6d03 100644 --- a/js/dist/util.js +++ b/js/dist/util.js @@ -79,24 +79,13 @@ }, getSelectorFromElement: function getSelectorFromElement(element) { var selector = element.getAttribute('data-target'); - var method = 'querySelector'; if (!selector || selector === '#') { - selector = (element.getAttribute('href') || '').trim(); + var hrefAttr = element.getAttribute('href'); + selector = hrefAttr && hrefAttr !== '#' ? hrefAttr.trim() : ''; } - var validSelector = selector; - - if (selector.charAt(0) === '#' && selector.indexOf(',') === -1) { - selector = selector.substr(1); - method = 'getElementById'; - } - - try { - return document[method](selector) ? validSelector : null; - } catch (err) { - return null; - } + return selector && document.querySelector(selector) ? selector : null; }, getTransitionDurationFromElement: function getTransitionDurationFromElement(element) { if (!element) { |
