rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

Backport #33634 (#33649)

Browse Source 
Dropdown: support `.dropdown-item` wrapped in `<li>` tags
This commit is contained in:
Carson Sievert 2021-04-27 23:02:22 -05:00 committed by GitHub
parent d967553913
commit 4b5eb3ca51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/tab.js
View File

@ -187,7 +187,12 @@ class Tab {
element.classList.add(CLASS_NAME_SHOW) element.classList.add(CLASS_NAME_SHOW)
} }
if (element.parentNode && $(element.parentNode).hasClass(CLASS_NAME_DROPDOWN_MENU)) { let parent = element.parentNode
if (parent && parent.nodeName === 'LI') {
parent = parent.parentNode
}
if (parent && $(parent).hasClass(CLASS_NAME_DROPDOWN_MENU)) {
const dropdownElement = $(element).closest(SELECTOR_DROPDOWN)[0] const dropdownElement = $(element).closest(SELECTOR_DROPDOWN)[0]
if (dropdownElement) { if (dropdownElement) {

22
js/tests/unit/tab.js
View File

@ -345,6 +345,28 @@ $(function () {
assert.notOk($tabs.find('li:last-child .dropdown-menu a:first-child').hasClass('active')) assert.notOk($tabs.find('li:last-child .dropdown-menu a:first-child').hasClass('active'))
}) })
QUnit.test('should support li > .dropdown-item', function (assert) {
assert.expect(2)
var tabsHTML = [
'<ul class="nav nav-tabs">',
' <li class="nav-item"><a class="nav-link active" href="#home" data-toggle="tab">Home</a></li>',
' <li class="nav-item"><a class="nav-link" href="#profile" data-toggle="tab">Profile</a></li>',
' <li class="nav-item dropdown">',
' <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#">Dropdown</a>',
' <ul class="dropdown-menu">',
' <li><a class="dropdown-item" href="#dropdown1" id="dropdown1-tab" data-toggle="tab">@fat</a></li>',
' <li><a class="dropdown-item" href="#dropdown2" id="dropdown2-tab" data-toggle="tab">@mdo</a></li>',
' </ul>',
' </li>',
'</ul>'
].join('')
var $tabs = $(tabsHTML).appendTo('#qunit-fixture')
$tabs.find('.dropdown-item').trigger('click')
assert.ok($tabs.find('.dropdown-item').hasClass('active'))
assert.notOk($tabs.find('.nav-link:not(.dropdown-toggle)').hasClass('active'))
})
QUnit.test('Nested tabs', function (assert) { QUnit.test('Nested tabs', function (assert) {
assert.expect(2) assert.expect(2)
var done = assert.async() var done = assert.async()