Skip to content

Commit ecfa417

Browse files
committed
refactor: improve syntax
1 parent b6f3527 commit ecfa417

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

js/src/dom/selector-engine.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ const getSelector = element => {
2929
hrefAttribute = `#${hrefAttribute.split('#')[1]}`
3030
}
3131

32-
selector = hrefAttribute && hrefAttribute !== '#' ? hrefAttribute.trim() : null
32+
selector = hrefAttribute && hrefAttribute !== '#' ? parseSelector(hrefAttribute.trim()) : null
3333
}
3434

35-
return parseSelector(selector)
35+
return selector
3636
}
3737

3838
const SelectorEngine = {

js/src/tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const CLASS_DROPDOWN = 'dropdown'
4343

4444
const SELECTOR_DROPDOWN_TOGGLE = '.dropdown-toggle'
4545
const SELECTOR_DROPDOWN_MENU = '.dropdown-menu'
46-
const NOT_SELECTOR_DROPDOWN_TOGGLE = ':not(.dropdown-toggle)'
46+
const NOT_SELECTOR_DROPDOWN_TOGGLE = `:not(${SELECTOR_DROPDOWN_TOGGLE})`
4747

4848
const SELECTOR_TAB_PANEL = '.list-group, .nav, [role="tablist"]'
4949
const SELECTOR_OUTER = '.nav-item, .list-group-item'

js/tests/unit/dom/selector-engine.spec.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,18 @@ describe('SelectorEngine', () => {
359359
expect(SelectorEngine.getMultipleElementsFromSelector(testEl)).toEqual(Array.from(fixtureEl.querySelectorAll('.target')))
360360
})
361361

362+
it('should get elements if several ids are given', () => {
363+
fixtureEl.innerHTML = [
364+
'<div id="test" data-cui-target="#target1,#target2"></div>',
365+
'<div class="target" id="target1"></div>',
366+
'<div class="target" id="target2"></div>'
367+
].join('')
368+
369+
const testEl = fixtureEl.querySelector('#test')
370+
371+
expect(SelectorEngine.getMultipleElementsFromSelector(testEl)).toEqual(Array.from(fixtureEl.querySelectorAll('.target')))
372+
})
373+
362374
it('should get elements in array, from href if no data-coreui-target set', () => {
363375
fixtureEl.innerHTML = [
364376
'<a id="test" href=".target"></a>',

0 commit comments

Comments
 (0)