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

do not show tab when disabled #20174

Closed
wants to merge 3 commits into from
Closed

do not show tab when disabled #20174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d74a9b9
do not show tab when disabled fixes #19849
maxbeatty Jun 25, 2016
537fff6
fixes for @houndci-bot
maxbeatty Aug 3, 2016
ad0182c
revert eslint fixes because phantomjs can't handle ES2015 yet
maxbeatty Aug 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions js/src/tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ const Tab = (($) => {
DROPDOWN_MENU : 'dropdown-menu',
ACTIVE : 'active',
FADE : 'fade',
IN : 'in'
IN : 'in',
DISABLED : 'disabled'
}

const Selector = {
Expand Down Expand Up @@ -77,15 +78,24 @@ const Tab = (($) => {
// public

show() {
if (this._element.parentNode &&
(this._element.parentNode.nodeType === Node.ELEMENT_NODE) &&
($(this._element).hasClass(ClassName.ACTIVE))) {
let $thisEl = $(this._element)

if (
(
this._element.parentNode &&
(this._element.parentNode.nodeType === Node.ELEMENT_NODE) &&
($thisEl.hasClass(ClassName.ACTIVE))
) || (
this._element.hasAttribute('disabled') ||
$thisEl.hasClass(ClassName.DISABLED)
)
) {
return
}

let target
let previous
let ulElement = $(this._element).closest(Selector.UL)[0]
let ulElement = $thisEl.closest(Selector.UL)[0]
let selector = Util.getSelectorFromElement(this._element)

if (ulElement) {
Expand All @@ -105,7 +115,7 @@ const Tab = (($) => {
$(previous).trigger(hideEvent)
}

$(this._element).trigger(showEvent)
$thisEl.trigger(showEvent)

if (showEvent.isDefaultPrevented() ||
(hideEvent.isDefaultPrevented())) {
Expand All @@ -131,7 +141,7 @@ const Tab = (($) => {
})

$(previous).trigger(hiddenEvent)
$(this._element).trigger(shownEvent)
$thisEl.trigger(shownEvent)
}

if (target) {
Expand Down
32 changes: 32 additions & 0 deletions js/tests/unit/tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,36 @@ $(function () {
assert.strictEqual($tabs.find('a:not(.active)').attr('aria-expanded'), 'false', 'after second show event, hidden tab has aria-expanded = false')
})

QUnit.test('should not active element when disabled by class', function (assert) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'QUnit' is not defined no-undef
Unexpected function expression prefer-arrow-callback

assert.expect(0)

var tabsHTML = '<ul class="tabs">'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unexpected var, use let or const instead no-var

+ '<li><a href="#home">Home</a></li>'
+ '<li><a href="#profile" class="disabled">Profile</a></li>'
+ '</ul>'

$(tabsHTML)
.find('li:last a')
.on('show.bs.tab', function (e) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unexpected function expression prefer-arrow-callback
'e' is defined but never used no-unused-vars

assert.ok(false, 'show event fired')
})
.bootstrapTab('show')
})

QUnit.test('should not active element when disabled by attribute', function (assert) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'QUnit' is not defined no-undef
Unexpected function expression prefer-arrow-callback

assert.expect(0)

var tabsHTML = '<ul class="tabs">'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unexpected var, use let or const instead no-var

+ '<li><a href="#home">Home</a></li>'
+ '<li><a href="#profile" disabled>Profile</a></li>'
+ '</ul>'

$(tabsHTML)
.find('li:last a')
.on('show.bs.tab', function (e) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unexpected function expression prefer-arrow-callback
'e' is defined but never used no-unused-vars

assert.ok(false, 'show event fired')
})
.bootstrapTab('show')
})

})
32 changes: 32 additions & 0 deletions js/tests/visual/tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,38 @@ <h4>Tabs with fade (no initially active pane)</h4>
</div>
</div>

<h4>Tabs with disabled tab</h4>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you add a visuel test in addition of a unit test ? Currently visuel tests are usefull to show something impossible to test in unit tests

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I felt it was a clearer way to demonstrate and verify the fix


<ul id="myTab4" class="nav nav-tabs">
<li class="nav-item"><a class="nav-link active" href="#home4" data-toggle="tab">Home</a></li>
<li class="nav-item"><a class="nav-link disabled" href="#profile4" data-toggle="tab">Profile</a></li>
<li class="dropdown nav-item">
<a href="#" id="myTabDrop5" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<div class="dropdown-menu" role="menu" aria-labelledby="myTabDrop5">
<a class="dropdown-item" href="#dropdown4-1" tabindex="-1" data-toggle="tab">@fat</a>
<a class="dropdown-item" href="#dropdown4-2" tabindex="-1" data-toggle="tab">@mdo</a>
</div>
</li>
</ul>
<div id="myTabContent4" class="tab-content">
<div class="tab-pane active" id="home4">
<p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
<p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
</div>
<div class="tab-pane" id="profile4">
<p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p>
<p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p>
</div>
<div class="tab-pane" id="dropdown4-1">
<p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.</p>
<p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.</p>
</div>
<div class="tab-pane" id="dropdown4-2">
<p>Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.</p>
<p>Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.</p>
</div>
</div>

</div>

<!-- JavaScript Includes -->
Expand Down