Fixed Accordion collapse bugs

Author: akserg

CHANGELOG.md

@@ -1,25 +1,37 @@
+#Version 0.6.5, (2015/02/25)
+
+##Bug Fixes
+
+- Accordion: double click on title causes inconstent state or bad rendering
+- Accordion Collapse
+
 #Version 0.6.0, (2014/12/12)
+
 - Migration on Angualr Dart 1.0, support Bootstrap 3.3.1 and bug fixes.
 
 #Version 0.5.5, (2014/06/25)
 
 ##Bug Fixes
+
 - Modal Dialog with backdrop:'static' cannot be closed by click on button with data-dismiss='modal'
 
 #Version 0.5.4, (2014/06/21)
 
 ##Bug Fixes
+
 - Error when using typeahead-on-select=ctrl.setSelectedItem($item, $model, $label)
 
 #Version 0.5.3, (2014/06/18)
 
 ##Bug Fixes
+
 - Typeahead placement of suggestion popover offset by approax 200px
 - Fix animation toggle and z-index calculation in ModalWindow
 
 #Version 0.5.2, (2014/06/17)
 
 ##Features
+
 - Project migrated to follow Dart SDK 1.4.3
 
 ##Bug Fixes
@@ -29,11 +41,13 @@
 #Version 0.5.1, (2014/06/06)
 
 ##Features
+
 - Project migrated to follow Angular Dart 0.12.0
 
 #Version 0.5.0, (2014/06/05)
 
 ##Features
+
 - All components have migrated away from Shadow DOM and applyAuthorStyles.
 
 ##Bug Fixes

lib/accordion/accordion.dart

@@ -8,6 +8,7 @@ import "package:angular/angular.dart";
 import 'package:angular/utils.dart' as utils;
 import 'package:logging/logging.dart' show Logger;
 import 'package:angular_ui/utils/dbl_click_preventer.dart';
+import 'package:angular_ui/utils/timeout.dart';
 
 part 'accordion_group.dart';
 

lib/accordion/accordion_group.dart

@@ -13,7 +13,7 @@ part of angular.ui.accordion;
       <a class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{'text-muted': isDisabled}">{{heading}}</span></a>
     </h4>
   </div>
-  <div class="panel-collapse" collapse="!isOpen">
+  <div class="panel-collapse" collapse="collapse">
     <div class="panel-body"><content></content></div>
   </div>
 </div>
@@ -26,22 +26,31 @@ class AccordionGroupComponent implements DetachAware, ScopeAware {
   var heading;
 
   Scope scope;
-  AccordionComponent accordion;
-  DblClickPreventer dblClickPreventer;
+  final AccordionComponent accordion;
+  final DblClickPreventer dblClickPreventer;
+  final Timeout timeout;
 
-  AccordionGroupComponent(this.accordion, this.dblClickPreventer) {
+  AccordionGroupComponent(this.accordion, this.dblClickPreventer, this.timeout) {
     accordion.addGroup(this);
+    //
+    timeout(() {
+      scope.watch('isOpen', (value, old){
+        collapse = !value;
+      });
+    }, delay:500);
   }
-
+  
   bool _isOpen = false;
   @NgTwoWay('is-open') 
-  get isOpen => _isOpen;
-  set isOpen(bool newValue) {
-    _isOpen = utils.toBool(newValue);
+  set isOpen(value) {
+    _isOpen = utils.toBool(value);
     if (_isOpen) {
       accordion.closeOthers(this);
     }
   }
+  get isOpen => _isOpen;
+  
+  bool collapse = false;
 
   bool _isDisabled = false;
   @NgTwoWay('is-disabled') 

lib/collapse/collapse.dart

@@ -49,7 +49,7 @@ class Collapse implements ScopeAware {
   async.Future doTransition(change) {
     async.Completer newTransition = transition(element, change);
 
-    var newTransitionDone = (value) {
+    var newTransitionDone = () {
       // Make sure it's this transition, otherwise, leave it alone.
       if (currentTransition == newTransition) {
         currentTransition = null;
@@ -62,8 +62,7 @@ class Collapse implements ScopeAware {
 
     currentTransition = newTransition;
 
-    newTransition.future.catchError(newTransitionDone);
-    newTransition.future.then(newTransitionDone);
+    newTransition.future.whenComplete(newTransitionDone);
 
     return newTransition.future;
   }

web/index.html

@@ -48,16 +48,6 @@ <h3>Datepicker (partially implemented)</h3>
     <h3>Modal Window</h3>
     <modal-demo-embedded-tmpl></modal-demo-embedded-tmpl>
     <modal-demo-embedded-tmpl-static-backdrop></modal-demo-embedded-tmpl-static-backdrop>
-<!--     <modal-demo-tag-tmpl></modal-demo-tag-tmpl> -->
-<!--     <div class="panel panel-default"> -->
-<!--       <div class="panel-heading">Modal from template file</div> -->
-<!--       <div class="panel-body"> -->
-<!--         <div modal-ctrl-file-tmpl> -->
-<!--           <button class="btn btn-default" ng-click="ctrl1.open('modal/modal_demo_template_from_file.html')">Open me!</button> -->
-<!--           <div ng-show="ctrl1.selected != null">Selected: {{ ctrl1.selected }}</div> -->
-<!--         </div> -->
-<!--       </div> -->
-<!--     </div> -->
     <hr>
 
     <h3>Rating</h3>