diff --git a/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee b/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee index 21bedf4697..dd8d9a279b 100644 --- a/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/tabset_ctrl.js.coffee @@ -5,15 +5,13 @@ Darkswarm.directive "tabsetCtrl", (Tabsets, $location) -> selected: "@" navigate: "=" prefix: "@?" - alwaysopen: "=" controller: ($scope, $element) -> if $scope.navigate path = $location.path()?.match(/^\/\w+$/)?[0] $scope.selected = path[1..] if path this.toggle = (name) -> - state = if $scope.alwaysopen then 'open' else null - Tabsets.toggle($scope.id, name, state) + Tabsets.toggle($scope.id, name) this.select = (selection) -> $scope.$broadcast("selection:changed", selection) diff --git a/app/assets/javascripts/darkswarm/services/tabsets.js.coffee b/app/assets/javascripts/darkswarm/services/tabsets.js.coffee index 9c24c48485..744e885fe7 100644 --- a/app/assets/javascripts/darkswarm/services/tabsets.js.coffee +++ b/app/assets/javascripts/darkswarm/services/tabsets.js.coffee @@ -7,12 +7,10 @@ Darkswarm.factory 'Tabsets', -> @tabsets.push { ctrl: ctrl, id: id, selected: selected } ctrl.select(selected) if selected? - toggle: (id, name, state=null) -> + toggle: (id, name) -> tabset = @findTabsetByObject(id) - if tabset.selected == name - @select(tabset, null) unless state == "open" - else - @select(tabset, name) unless state == "closed" + if tabset.selected != name + @select(tabset, name) select: (tabset, name) -> tabset.selected = name