From 3c6e1b9c3e4082bc3dd2c3abc0d4532bc769239f Mon Sep 17 00:00:00 2001 From: Brandon Myers Date: Fri, 24 Jul 2015 22:56:16 -0500 Subject: [PATCH 01/12] Fixed #47. When a selectable attribute is present, use querySelectorAll to find selectable nodes. --- iron-selectable.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/iron-selectable.html b/iron-selectable.html index 6fd61c7..d6e2233 100644 --- a/iron-selectable.html +++ b/iron-selectable.html @@ -147,7 +147,11 @@ * @type Array */ get items() { - var nodes = Polymer.dom(this).queryDistributedElements(this.selectable || '*'); + var nodes; + if (this.selectable) + nodes = Polymer.dom(this).querySelectorAll(this.selectable); + else + nodes = Polymer.dom(this).queryDistributedElements(this.selectable || '*'); return Array.prototype.filter.call(nodes, this._bindFilterItem); }, From e9f1e810f82753c13aacd8edafb266107f04c318 Mon Sep 17 00:00:00 2001 From: Brandon Myers Date: Mon, 27 Jul 2015 14:28:33 -0500 Subject: [PATCH 02/12] Added tests for added functionality of deep selectable items. --- test/content-element.html | 4 +-- test/content.html | 69 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/test/content-element.html b/test/content-element.html index d0cd6d7..3658b44 100644 --- a/test/content-element.html +++ b/test/content-element.html @@ -34,10 +34,8 @@ selected: { type: String, notify: true - } - + }, } - }); diff --git a/test/content.html b/test/content.html index e869f98..df09663 100644 --- a/test/content.html +++ b/test/content.html @@ -49,16 +49,32 @@ + + diff --git a/test/template-repeat.html b/test/template-repeat.html index eae2729..8d0bdd4 100644 --- a/test/template-repeat.html +++ b/test/template-repeat.html @@ -92,7 +92,7 @@ test('set selected to something else', function(done) { setTimeout(function() { // set selected to something else - s.selected = 3; + s.set('selected', 3); // check selected item var item = s.selectedItem; assert.equal(s.items[3], item); @@ -107,4 +107,4 @@ - + \ No newline at end of file From fa8952d09201990007b3981a1d66c0583470c470 Mon Sep 17 00:00:00 2001 From: Brandon Myers Date: Fri, 14 Aug 2015 10:56:01 -0500 Subject: [PATCH 06/12] Added demo for repeat templates with selector. --- demo/index.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/demo/index.html b/demo/index.html index 2fa46b2..575447d 100644 --- a/demo/index.html +++ b/demo/index.html @@ -80,7 +80,25 @@

Example

+ +
+

Example

+
+ + +
Item 4
+
+
+
+ From 919618dd494fe915d63eb0ae89b64dffbddd36e2 Mon Sep 17 00:00:00 2001 From: Brandon Myers Date: Fri, 24 Jul 2015 22:56:16 -0500 Subject: [PATCH 07/12] Fixed #47. When a selectable attribute is present, use querySelectorAll to find selectable nodes. --- iron-selectable.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/iron-selectable.html b/iron-selectable.html index d8ba693..59ef0a9 100644 --- a/iron-selectable.html +++ b/iron-selectable.html @@ -147,7 +147,11 @@ * @type Array */ get items() { - var nodes = Polymer.dom(this).queryDistributedElements(this.selectable || '*'); + var nodes; + if (this.selectable) + nodes = Polymer.dom(this).querySelectorAll(this.selectable); + else + nodes = Polymer.dom(this).queryDistributedElements(this.selectable || '*'); return Array.prototype.filter.call(nodes, this._bindFilterItem); }, From 512c2b8eb98f5fab07dc4e22edde2d9a2312d0be Mon Sep 17 00:00:00 2001 From: Brandon Myers Date: Mon, 27 Jul 2015 14:28:33 -0500 Subject: [PATCH 08/12] Added tests for added functionality of deep selectable items. --- test/content-element.html | 4 +-- test/content.html | 69 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 4 deletions(-) diff --git a/test/content-element.html b/test/content-element.html index d0cd6d7..3658b44 100644 --- a/test/content-element.html +++ b/test/content-element.html @@ -34,10 +34,8 @@ selected: { type: String, notify: true - } - + }, } - }); diff --git a/test/content.html b/test/content.html index e869f98..df09663 100644 --- a/test/content.html +++ b/test/content.html @@ -49,16 +49,32 @@ + + diff --git a/test/template-repeat.html b/test/template-repeat.html index eae2729..8d0bdd4 100644 --- a/test/template-repeat.html +++ b/test/template-repeat.html @@ -92,7 +92,7 @@ test('set selected to something else', function(done) { setTimeout(function() { // set selected to something else - s.selected = 3; + s.set('selected', 3); // check selected item var item = s.selectedItem; assert.equal(s.items[3], item); @@ -107,4 +107,4 @@ - + \ No newline at end of file From 7e5eb6b1765dc3d64a6ff91f95b6ed1783061954 Mon Sep 17 00:00:00 2001 From: Brandon Myers Date: Fri, 14 Aug 2015 10:56:01 -0500 Subject: [PATCH 12/12] Added demo for repeat templates with selector. --- demo/index.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/demo/index.html b/demo/index.html index 2fa46b2..575447d 100644 --- a/demo/index.html +++ b/demo/index.html @@ -80,7 +80,25 @@

Example

+ +
+

Example

+
+ + +
Item 4
+
+
+
+