Merge pull request #1576 from Polymer/nested-behaviors

allow behavior arrays to contain nested behavior arrays
Polymer · May 20, 2015 · a43eb0f · a43eb0f
2 parents cdecff4 + 6a2952d
commit a43eb0f
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 3 deletions.
diff --git a/src/micro/behaviors.html b/src/micro/behaviors.html
@@ -53,7 +53,7 @@
       var flat = [];
       behaviors.forEach(function(b) {
         if (b instanceof Array) {
-          flat = flat.concat(b);
+          flat = flat.concat(this._flattenBehaviorsList(b));
         } else {
           flat.push(b);
         }

diff --git a/test/unit/behaviors-elements.html b/test/unit/behaviors-elements.html
@@ -26,6 +26,10 @@
 
       overridableProperty: {
         value: false
+      },
+
+      hasBehaviorA: {
+        value: true
       }
 
     },
@@ -68,6 +72,10 @@
       hasOptionsB: {
         readOnly: true,
         notify: true
+      },
+
+      hasBehaviorB: {
+        value: true
       }
 
     },
@@ -106,8 +114,6 @@
 
   <script>
 
-    Polymer._toOverride = function() {};
-
     Polymer({
 
       behaviors: [
@@ -141,3 +147,48 @@
   </script>
 
 </dom-module>
+
+<script>
+
+  Polymer.BehaviorC = {
+
+    properties: {
+
+      hasBehaviorC: {
+        value: true
+      }
+
+    }
+
+  };
+
+  Polymer.BehaviorD = {
+
+    properties: {
+
+      hasBehaviorD: {
+        value: true
+      }
+
+    }
+
+  };
+
+</script>
+
+<dom-module id="nested-behaviors">
+
+  <script>
+
+    Polymer({
+
+      behaviors: [
+        [[Polymer.BehaviorC, Polymer.BehaviorB], Polymer.BehaviorA],
+        Polymer.BehaviorD
+      ]
+
+    });
+
+  </script>
+
+</dom-module>
diff --git a/test/unit/behaviors.html b/test/unit/behaviors.html
@@ -109,6 +109,29 @@
   });
 });
 
+
+suite('nexted-behaviors element', function() {
+
+  var el;
+
+  setup(function() {
+    el = document.createElement('nested-behaviors');
+    document.body.appendChild(el);
+  });
+
+  teardown(function() {
+    document.body.removeChild(el);
+  });
+
+  test('properties from nested behaviors', function() {
+    assert.ok(el.hasBehaviorA, "missing BehaviorA");
+    assert.ok(el.hasBehaviorB, "missing BehaviorB");
+    assert.ok(el.hasBehaviorC, "missing BehaviorC");
+    assert.ok(el.hasBehaviorD, "missing BehaviorD");
+  });
+
+});
+
 </script>
 
 </body>