bug fix - not allowing user to toggle each accordion group.

angular-ui · Nov 13, 2012 · b8d67a6 · b8d67a6
1 parent cdcef31
commit b8d67a6
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/src/accordion/accordion.js b/src/accordion/accordion.js
@@ -3,23 +3,32 @@ angular.module('ui.bootstrap.accordion').controller('AccordionController', ['$sc
 
   var groups = $scope.groups = [];
 
-  this.select = function (group) {
+  this.select = function(group) {
     angular.forEach(groups, function (group) {
       group.selected = false;
     });
     group.selected = true;
   };
 
-  this.addGroup = function (group) {
+  this.toggle = function(group) {
+    if (group.selected) {
+      group.selected = false;
+    } else {
+      this.select(group);
+    }
+  };
+
+  this.addGroup = function(group) {
     groups.push(group);
     if(group.selected) {
       this.select(group);
     }
   };
 
-  this.removeGroup = function (group) {
+  this.removeGroup = function(group) {
     groups.splice(groups.indexOf(group), 1);
   };
+
 }]);
 
 /* accordion: Bootstrap accordion implementation
@@ -48,14 +57,18 @@ angular.module('ui.bootstrap.accordion').directive('accordionGroup', function ()
     scope:{
       title:'='
     },
-    link:function (scope, element, attrs, accordionCtrl) {
+    link: function(scope, element, attrs, accordionCtrl) {
 
       accordionCtrl.addGroup(scope);
 
-      scope.select = function () {
+      scope.select = function() {
         accordionCtrl.select(scope);
       };
 
+      scope.toggle = function() {
+        accordionCtrl.toggle(scope);
+      };
+
       scope.$on('$destroy', function (event) {
         accordionCtrl.removeGroup(scope);
       });

diff --git a/src/accordion/test/accordionSpec.js b/src/accordion/test/accordionSpec.js
@@ -90,6 +90,13 @@ describe('accordion', function () {
         expect(findGroupBody(0)).not.toHaveClass('in');
         expect(findGroupBody(1)).toHaveClass('in');
       });
+
+      it('should toggle element on click', function() {
+        findGroupLink(0).click();
+        expect(findGroupBody(0)).toHaveClass('in');
+        findGroupLink(0).click();
+        expect(findGroupBody(0)).not.toHaveClass('in');
+      });
     });
 
     describe('dynamic accordion', function () {

diff --git a/template/accordion/accordion-group.html b/template/accordion/accordion-group.html
@@ -1,6 +1,6 @@
 <div class="accordion-group">
     <div class="accordion-heading">
-        <a class="accordion-toggle" ng-click="select()">{{title}}</a>
+        <a class="accordion-toggle" ng-click="toggle()">{{title}}</a>
     </div>
     <div class="accordion-body collapse" ng-class="{in : selected}">
         <div class="accordion-inner" ng-transclude></div>