feat(tabs): it should not select first not active tab as selected

angular-ui · Mar 16, 2015 · 91b5fb6 · 91b5fb6
1 parent a5a82d9
commit 91b5fb6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/tabs/tabs.js b/src/tabs/tabs.js
@@ -28,11 +28,14 @@ angular.module('ui.bootstrap.tabs', [])
     tabs.push(tab);
     // we can't run the select function on the first tab
     // since that would select it twice
-    if (tabs.length === 1) {
+    if (tabs.length === 1 && tab.active !== false) {
       tab.active = true;
     } else if (tab.active) {
       ctrl.select(tab);
     }
+    else {
+      tab.active = false;
+    }
   };
 
   ctrl.removeTab = function removeTab(tab) {

diff --git a/src/tabs/test/tabs.spec.js b/src/tabs/test/tabs.spec.js
@@ -384,8 +384,13 @@ describe('tabs', function() {
 
   describe('tabset controller', function() {
     function mockTab(isActive) {
+      var _isActive;
+      if (isActive || isActive === false) {
+        _isActive = isActive;
+      }
+
       return {
-        active: !!isActive,
+        active: _isActive,
         onSelect : angular.noop,
         onDeselect : angular.noop
       };
@@ -459,6 +464,13 @@ describe('tabs', function() {
         expect(tab1.active).toBe(true);
       });
 
+      it('should not select first active === false tab as selected', function() {
+        var tab = mockTab(false);
+
+        ctrl.addTab(tab);
+        expect(tab.active).toBe(false);
+      });
+
       it('should select a tab added that\'s already active', function() {
         var tab1 = mockTab(), tab2 = mockTab(true);
         ctrl.addTab(tab1);