Merge pull request Polymer#20 from PolymerLabs/selector-children

[x-selector] Default to child elements if selectable is not provided
nevir · Nov 17, 2014 · 5cfaced · 5cfaced
2 parents cb72d75 + f08659d
commit 5cfaced
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/components/x-elements/x-selector.html b/components/x-elements/x-selector.html
@@ -68,8 +68,13 @@
 
     get items() {
       if (!this._items) {
-        this._items = 
-          Array.prototype.slice.call(this.querySelectorAll(this.selectable), 0)
+        var nodes;
+        if (this.selectable) {
+          nodes = this.querySelectorAll(this.selectable);
+        } else {
+          nodes = this.children;
+        }
+        this._items = Array.prototype.slice.call(nodes, 0);
       }
       return this._items;
     },