1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 04:41:36 +02:00
This commit is contained in:
Mark Otto
2018-08-18 20:22:08 -07:00
parent ab7ce480f2
commit c0fd91788e
32 changed files with 1198 additions and 124 deletions

View File

@@ -141,13 +141,21 @@
},
getSelectorFromElement: function getSelectorFromElement(element) {
var selector = element.getAttribute('data-target');
var method = 'querySelector';
if (!selector || selector === '#') {
selector = element.getAttribute('href') || '';
selector = (element.getAttribute('href') || '').trim();
}
var validSelector = selector;
if (selector.charAt(0) === '#' && selector.indexOf(',') === -1) {
selector = selector.substr(1);
method = 'getElementById';
}
try {
return document.querySelector(selector) ? selector : null;
return document[method](selector) ? validSelector : null;
} catch (err) {
return null;
}
@@ -3260,7 +3268,7 @@
var _config = typeof config === 'object' ? config : null;
if (!data && /destroy|hide/.test(config)) {
if (!data && /dispose|hide/.test(config)) {
return;
}