Fixes #86: Deselects nodes which are no longer items after items change.

PolymerElements · Jan 5, 2016 · 5ecd3eb · 5ecd3eb
1 parent 1ce0edd
commit 5ecd3eb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/iron-multi-selectable.html b/iron-multi-selectable.html
@@ -81,7 +81,7 @@
       if (this.multi) {
         this._selectMulti(this.selectedValues);
       } else {
-        this._selectSelected(this.selected);
+        this._selectSelected();
       }
     },
 

diff --git a/iron-selectable.html b/iron-selectable.html
@@ -134,7 +134,7 @@
     },
 
     observers: [
-      '_updateSelected(attrForSelected, selected)'
+      '_selectSelected(attrForSelected, selected)'
     ],
 
     created: function() {
@@ -146,7 +146,7 @@
       this._observer = this._observeItems(this);
       this._updateItems();
       if (!this._shouldUpdateSelection) {
-        this._updateSelected(this.attrForSelected,this.selected)
+        this._selectSelected();
       }
       this._addListener(this.activateEvent);
     },
@@ -221,13 +221,11 @@
       var nodes = Polymer.dom(this).queryDistributedElements(this.selectable || '*');
       nodes = Array.prototype.filter.call(nodes, this._bindFilterItem);
       this._setItems(nodes);
+      // Deselect anything that is no longer an item.
+      this._selection.clear(nodes);
     },
 
-    _updateSelected: function() {
-      this._selectSelected(this.selected);
-    },
-
-    _selectSelected: function(selected) {
+    _selectSelected: function() {
       this._selection.select(this._valueToItem(this.selected));
     },
 
@@ -294,7 +292,7 @@
         this._updateItems();
 
         if (this._shouldUpdateSelection) {
-          this._updateSelected();
+          this._selectSelected();
         }
       });
     },