Merge branch 'Colinh84-Colinh84-issue-673' into dev

Author: Nick Litwin

app/directives/tc-tabs/tc-tabs.directive.js

@@ -11,25 +11,53 @@ import angular from 'angular'
         bindToController: true,
         template: require('./tc-tabs')(),
         scope: {},
-        controller: ['$log', function($log, $scope, $element) {
+        controller: ['$log', '$location', '$scope', function($log, $location, $scope, $element) {
           $log = $log.getInstance('TcTabSetController')
           this.tabs = []
+
           this.addTab = function addTab(tab) {
             this.tabs.push(tab)
-            if (this.tabs.length === 1) {
+
+            if (!angular.isDefined($location.search().tab) && this.tabs.length === 1) {
+              tab.active = true
+            } else if ($location.search().tab === tab.heading) {
               tab.active = true
             }
           }
 
           this.select = function(selectedTab) {
+            var select = false
+
             angular.forEach(this.tabs, function(tab) {
-              if (tab.active && tab !== selectedTab) {
+              if (tab.active && tab.heading !== selectedTab.heading) {
                 tab.active = false
+              } else if (tab.heading === selectedTab.heading) {
+                tab.active = true
+                select = true
               }
             })
 
-            selectedTab.active = true
+            if (select === false && this.tabs.length > 0) {
+              this.tabs[0].active = true
+            }
+          }
+
+          this.setTab = function(tab) {
+            if ($location.search().tab !== tab.heading) {
+              $location.search('tab', tab.heading)
+            }
           }
+
+          $scope.$on('$locationChangeSuccess', () => {
+            var tab
+            if (angular.isDefined($location.search().tab)) {
+              tab = $location.search().tab
+              this.select({'heading' : tab})
+            } else if (this.tabs.length > 0) {
+              tab = this.tabs[0].heading
+              this.select({'heading' : tab})
+            }
+          })
         }],
         controllerAs: 'tabSet'
       }

app/directives/tc-tabs/tc-tabs.jade

@@ -1,8 +1,8 @@
 .tab-panel
-  
+
   ul.tab-set
     li.tab-pill(ng-repeat="tab in tabSet.tabs")
-      a(ng-click="tabSet.select(tab)", ng-class="{'selected': tab.active}")
+      a(ng-click="tabSet.setTab(tab)", ng-class="{'selected': tab.active}")
         .header(ng-class="{'selected': tab.active}") {{tab.heading}}
 
   .tab-view(ng-transclude)