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

[tabs] Ensure only one tab is ever active (issue 472) #474

Merged
merged 19 commits into from May 29, 2017
Merged

[tabs] Ensure only one tab is ever active (issue 472) #474

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
74b15d4
[carousel] Fixed this arg in forEach
tmorehouse May 16, 2017
8a961f5
[carousel] coerce querySelectorAll into an array
tmorehouse May 17, 2017
5e6a5ba
[carousel] ESLint
tmorehouse May 17, 2017
244800c
Merge pull request #1 from bootstrap-vue/master
tmorehouse May 17, 2017
656a8e2
Merge pull request #2 from bootstrap-vue/master
tmorehouse May 17, 2017
2830201
Merge pull request #3 from bootstrap-vue/master
tmorehouse May 18, 2017
a2de129
Merge pull request #4 from bootstrap-vue/master
tmorehouse May 19, 2017
c7daa0a
Merge pull request #5 from bootstrap-vue/master
tmorehouse May 19, 2017
48ac553
Merge pull request #6 from bootstrap-vue/master
tmorehouse May 22, 2017
916bbe0
Merge pull request #7 from bootstrap-vue/master
tmorehouse May 23, 2017
90b4e6b
[input-group-addon] conditional ID on root element
tmorehouse May 24, 2017
fe8a289
[nav-item-dropdown] add ID to root element
tmorehouse May 24, 2017
8a8e799
Merge pull request #8 from bootstrap-vue/master
tmorehouse May 24, 2017
f7c7ff8
Merge pull request #9 from bootstrap-vue/master
tmorehouse May 29, 2017
7db897f
[popover] [tooltip
tmorehouse May 29, 2017
9251a88
Delete popover.js
tmorehouse May 29, 2017
74639c5
[tabs] fix issue 472
tmorehouse May 29, 2017
217666c
[tabs] ESLint
tmorehouse May 29, 2017
f123f7f
[tabs] minor code adjustment
tmorehouse May 29, 2017
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
15 changes: 9 additions & 6 deletions lib/components/tabs.vue
View file
Open in desktop
Expand Up @@ -183,10 +183,12 @@
return;
}

// Deactivate previous active tab
if (this.tabs[this.currentTab]) {
this.$set(this.tabs[this.currentTab], 'localActive', false);
}
// Deactivate any previous active tab(s)
this.tabs.forEach( t => {
if (t !== tab && t.active) {
this.$set(t, 'localActive', false);
}
});

// Set new tab as active
this.$set(tab, 'localActive', true);
Expand All @@ -212,10 +214,11 @@
this.$set(tab, 'lazy', this.lazy);
});

// Set initial active tab
// Get initial active tab
let tabIndex = this.currentTab;

if (this.currentTab === null || this.currentTab === undefined) {
if (tabIndex === null || tabIndex === undefined) {
// Find last active tab in current tabs
this.tabs.forEach((tab, index) => {
if (tab.active) {
tabIndex = index;
Expand Down