fix(behavior): not all attached/detached were cascaded

Fixes #35
aurelia · Mar 22, 2015 · 31702e1 · 31702e1
1 parent d260bdb
commit 31702e1
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/behavior-instance.js b/src/behavior-instance.js
@@ -2,6 +2,7 @@ export class BehaviorInstance {
   constructor(behavior, executionContext, instruction){
     this.behavior = behavior;
     this.executionContext = executionContext;
+    this.isAttached = false;
 
     var observerLookup = behavior.observerLocator.getObserversLookup(executionContext),
         handlesBind = behavior.handlesBind,
@@ -70,14 +71,32 @@ export class BehaviorInstance {
   }
 
   attached(){
+    if(this.isAttached){
+      return;
+    }
+
+    this.isAttached = true;
+
     if(this.behavior.handlesAttached){
       this.executionContext.attached();
     }
+
+    if(this.view){
+      this.view.attached();
+    }
   }
 
   detached(){
-    if(this.behavior.handlesDetached){
-      this.executionContext.detached();
+    if(this.isAttached){
+      this.isAttached = false;
+
+      if(this.view){
+        this.view.detached();
+      }
+
+      if(this.behavior.handlesDetached){
+        this.executionContext.detached();
+      }
     }
   }
-}
+}
diff --git a/src/view.js b/src/view.js
@@ -99,7 +99,7 @@ export class View {
 
   insertNodesBefore(refNode){
     var parent = refNode.parentNode;
-    parent.insertBefore(this.fragment, refNode); 
+    parent.insertBefore(this.fragment, refNode);
   }
 
   appendNodesTo(parent){
@@ -169,7 +169,7 @@ export class View {
       children = this.children;
       for(i = 0, ii = children.length; i < ii; ++i){
         children[i].detached();
-      }   
+      }
     }
   }
-}
+}