Closes #538. Closes #722

elastic · Dec 3, 2013 · d0f90b0 · d0f90b0 · michalre · Dec 5, 2013
1 parent e832519
commit d0f90b0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/vendor/angular/angular-strap.js b/src/vendor/angular/angular-strap.js
@@ -712,11 +712,15 @@ angular.module('$strap.directives').directive('bsTabs', [
             scope.$watch(iAttrs.ngModel, function (newValue, oldValue) {
               if (angular.isUndefined(newValue))
                 return;
+              console.log(oldValue +" -> "+ newValue);
               activeTab = newValue;
               setTimeout(function () {
-                var $next = $($tabs[0].querySelectorAll('li')[newValue * 1]);
-                if (!$next.hasClass('active')) {
-                  $next.children('a').tab('show');
+                // Check if we're still on the same tab before making the switch
+                if(activeTab === newValue) {
+                  var $next = $($tabs[0].querySelectorAll('li')[newValue * 1]);
+                  if (!$next.hasClass('active')) {
+                    $next.children('a').tab('show');
+                  }
                 }
               });
             });