mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-23 09:41:11 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/util.js
View File

@ -77,12 +77,20 @@ const Util = (($) => {
getSelectorFromElement(element) { getSelectorFromElement(element) {
let selector = element.getAttribute('data-target') let selector = element.getAttribute('data-target')
let method = 'querySelector'
if (!selector || selector === '#') { 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 { try {
return document.querySelector(selector) ? selector : null return document[method](selector) ? validSelector : null
} catch (err) { } catch (err) {
return null return null
} }

12
js/tests/unit/util.js
View File

@ -20,6 +20,18 @@ $(function () {
assert.strictEqual(Util.getSelectorFromElement($el2[0]), null) assert.strictEqual(Util.getSelectorFromElement($el2[0]), null)
}) })
QUnit.test('Util.getSelectorFromElement should use getElementById', function (assert) {
assert.expect(2)
var spy = sinon.spy(document, 'getElementById')
var $el = $('<div data-target="#7"></div>').appendTo($('#qunit-fixture'))
$('<div id="7" />').appendTo($('#qunit-fixture'))
assert.strictEqual(Util.getSelectorFromElement($el[0]), '#7')
assert.ok(spy.called)
})
QUnit.test('Util.typeCheckConfig should thrown an error when a bad config is passed', function (assert) { QUnit.test('Util.typeCheckConfig should thrown an error when a bad config is passed', function (assert) {
assert.expect(1) assert.expect(1)
var namePlugin = 'collapse' var namePlugin = 'collapse'