Merge pull request #51 from unicef-polymer/develop

Develop
unicef-polymer · Feb 28, 2017 · 81428a9 · 81428a9
2 parents 5f2d8d9 + bee554b
commit 81428a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "etools-searchable-multiselection-menu",
   "description": "Dropdown menu with search and multiple options selection",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "license": "https://github.com/unicef-polymer/etools-searchable-multiselection-menu/blob/master/LICENSE.md",
   "main": "etools-searchable-multiselection-menu.html",
   "dependencies": {

diff --git a/demo/demo-custom-objects-as-options.html b/demo/demo-custom-objects-as-options.html
@@ -93,13 +93,13 @@ <h3>Custom objects as options and selected property with no change events</h3>
             this.set('customObjOptions', this.generateOptions());
           }.bind(this), 3000);
 
-          // setTimeout(function() {
-          //   this.set('selectedId', 3);
-          // }.bind(this), 3000);
+          setTimeout(function() {
+            this.set('selectedIds', null);
+          }.bind(this), 7000);
         },
 
         _returnIdsString: function(vals) {
-          return vals.join(', ');
+          return vals instanceof Array ? vals.join(', ') : null;
         },
 
         _singleSelectionChanged: function(event) {

diff --git a/etools-searchable-multiselection-menu.html b/etools-searchable-multiselection-menu.html
@@ -549,7 +549,7 @@
           }
         },
         _valueChanged: function(value) {
-          if (!value) {
+          if (!value || (value instanceof Array && value.length === 0)) {
             // empty value/reset selection
             this.set('selectedValues', null);
             return;