Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dynamic tabs: use buttons rather than links (backport to v4) #33163

Merged
merged 21 commits into from
May 24, 2022
Merged

Dynamic tabs: use buttons rather than links (backport to v4) #33163

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1d9e3fb
Manually backport 32630
patrickhlauke Feb 20, 2021
72d8864
Tweak unit test
patrickhlauke Mar 2, 2021
d476cfa
Tweak unit tests
patrickhlauke Mar 3, 2021
3b40fdf
More tweakage
patrickhlauke Mar 3, 2021
884a698
show() should also bail if `disabled` attribute is set
patrickhlauke Mar 3, 2021
df71e26
Tweak tests
patrickhlauke Mar 3, 2021
387e2fb
Simplify test for relatedTarget
patrickhlauke Mar 3, 2021
3235353
Temporarily remove problematic test
patrickhlauke Mar 3, 2021
ca76557
Revert previous
patrickhlauke Mar 3, 2021
4fa07bd
Merge branch 'v4-dev' into patrickhlauke-navs-tabs-v4
patrickhlauke Apr 11, 2021
1fd5766
Merge branch 'v4-dev' into patrickhlauke-navs-tabs-v4
patrickhlauke May 8, 2021
2052f21
test: fix broken test cases for tab.js
alpadev May 8, 2021
0824e3e
test: fix role=tablist invalid on nav element
alpadev May 8, 2021
0a2e1ed
test: prefer <div/> over <div></div>
alpadev May 8, 2021
f926077
Manually backport 32630
patrickhlauke Feb 20, 2021
be6a61a
test: fix broken test cases for tab.js
alpadev May 8, 2021
2f5e705
Merge branch 'v4-dev' into patrickhlauke-navs-tabs-v4
patrickhlauke Mar 24, 2022
4fde590
Merge branch 'patrickhlauke-navs-tabs-v4' of https://github.com/twbs/…
patrickhlauke Mar 24, 2022
70fa543
Fixes
patrickhlauke Mar 24, 2022
fea2f87
Merge branch 'v4-dev' into patrickhlauke-navs-tabs-v4
mdo May 24, 2022
2c08560
Remove and ignore lock file
mdo May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions js/tests/unit/tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ $(function () {

QUnit.test('should throw explicit error on undefined method', function (assert) {
assert.expect(1)
var $el = $('<div/>')
var $el = $('<div></div>')
alpadev marked this conversation as resolved.
Show resolved Hide resolved
$el.bootstrapTab()
try {
$el.bootstrapTab('noMethod')
Expand All @@ -38,7 +38,7 @@ $(function () {

QUnit.test('should return jquery collection containing the element', function (assert) {
assert.expect(2)
var $el = $('<div/>')
var $el = $('<div></div>')
var $tab = $el.bootstrapTab()
assert.ok($tab instanceof $, 'returns jquery collection')
assert.strictEqual($tab[0], $el[0], 'collection contains element')
Expand All @@ -51,7 +51,7 @@ $(function () {
'<li><button type="button" data-target="#profile" role="tab">Profile</button></li>' +
'</ul>'

$('<ul><li id="home" role="tabpanel"/><li id="profile" role="tabpanel"/></ul>').appendTo('#qunit-fixture')
$('<ul><li id="home" role="tabpanel"></li><li id="profile" role="tabpanel"></li></ul>').appendTo('#qunit-fixture')

$(tabsHTML).find('li:last-child button').bootstrapTab('show')
assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'profile')
Expand All @@ -67,7 +67,7 @@ $(function () {
'<li><a href="#profile" role="tab">Profile</a></li>' +
'</ul>'

$('<ul><li id="home" role="tabpanel"/><li id="profile" role="tabpanel"/></ul>').appendTo('#qunit-fixture')
$('<ul><li id="home" role="tabpanel"></li><li id="profile" role="tabpanel"></li></ul>').appendTo('#qunit-fixture')

$(tabsHTML).find('li:last-child a').bootstrapTab('show')
assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'profile')
Expand All @@ -83,7 +83,7 @@ $(function () {
'<li><a href="#profile">Profile</a></li>' +
'</ul>'

$('<ul><li id="home"/><li id="profile"/></ul>').appendTo('#qunit-fixture')
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo('#qunit-fixture')

$(pillsHTML).find('li:last-child a').bootstrapTab('show')
assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'profile')
Expand All @@ -99,7 +99,7 @@ $(function () {
'<li><button type="button" href="#profile" role="tab">Profile</button></li>' +
'</ol>'

$('<ol><li id="home" role="tabpanel"/><li id="profile" role="tabpanel"/></ol>').appendTo('#qunit-fixture')
$('<ol><li id="home" role="tabpanel"></li><li id="profile" role="tabpanel"></li></ol>').appendTo('#qunit-fixture')

$(pillsHTML).find('li:last-child button').bootstrapTab('show')
assert.strictEqual($('#qunit-fixture').find('.active').attr('id'), 'profile')
Expand Down Expand Up @@ -144,7 +144,7 @@ $(function () {
assert.expect(1)
var done = assert.async()

$('<div class="nav"/>')
$('<div class="nav"></div>')
.on('show.bs.tab', function (e) {
e.preventDefault()
assert.ok(true, 'show event fired')
Expand Down