Merge branch 'useshadowdom-noview' of https://github.com/Aaike/templa…

…ting into Aaike-useshadowdom-noview
aurelia · May 6, 2015 · 8ab754d · 8ab754d
2 parents 9d26ad1 + 66775dd
commit 8ab754d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/html-behavior.js b/src/html-behavior.js
@@ -193,20 +193,22 @@ export class HtmlBehaviorResource {
       if(element){
         element.primaryBehavior = behaviorInstance;
 
-        if(behaviorInstance.view){
-          if(this.usesShadowDOM) {
-            host = element.createShadowRoot();
-          }else{
-            host = element;
+        if(this.usesShadowDOM) {
+          host = element.createShadowRoot();
+        }else{
+          host = element;
+        }
 
+        if(behaviorInstance.view){
+          if(!this.usesShadowDOM) {
             if(instruction.contentFactory){
               var contentView = instruction.contentFactory.create(container, null, contentSelectorFactoryOptions);
 
               ContentSelector.applySelectors(
                 contentView,
                 behaviorInstance.view.contentSelectors,
                 (contentSelector, group) => contentSelector.add(group)
-                );
+              );
 
               behaviorInstance.contentView = contentView;
             }