From 1b2139774d764b0ca1e5dd7913659597d3fc44e1 Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Thu, 6 Aug 2015 16:36:09 -0700
Subject: [PATCH] Make _itemsChanged depend on multi.

---
 src/lib/template/array-selector.html | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/lib/template/array-selector.html b/src/lib/template/array-selector.html
index 5a3984d581..5e30a7c7a8 100644
--- a/src/lib/template/array-selector.html
+++ b/src/lib/template/array-selector.html
@@ -73,8 +73,7 @@
        * An array containing items from which selection will be made.
        */
       items: {
-        type: Array,
-        observer: '_itemsChanged'
+        type: Array
       },
 
       /**
@@ -98,10 +97,17 @@
        * `selected` is an array of currently selected items).  When `false`,
        * only one item may be selected at a time.
        */
-      multi: Boolean
+      multi: {
+        type: Boolean,
+        value: false
+      }
     },
 
-    _itemsChanged: function() {
+    observers: [
+      '_itemsChanged(items, multi)'
+    ],
+
+    _itemsChanged: function(items, multi) {
       // Unbind previous selection
       if (Array.isArray(this.selected)) {
         for (var i=0; i<this.selected.length; i++) {
@@ -111,7 +117,7 @@
         this.unlinkPaths('selected');
       }
       // Initialize selection
-      if (this.multi) {
+      if (multi) {
         this.selected = [];
       } else {
         this.selected = null;
@@ -151,8 +157,7 @@
         // var sidx = this.selected.indexOf(item);
         // if (sidx < 0) {
         var scol = Polymer.Collection.get(this.selected);
-        var skey = scol.getKey(item);
-        if (skey >= 0) {
+        if (scol.getKey(item) !== undefined) {
           if (this.toggle) {
             this.deselect(item);
           }