Merge branch 'master' of https://github.com/MrStobbart/vue-select into MrStobbart-master

Jeff · Jeff · commit de0f46485a78 · 2019-02-09T15:16:23.000-08:00
# Conflicts:
#	dist/vue-select.js
#	dist/vue-select.js.map
diff --git a/dev/dev.html b/dev/dev.html
@@ -75,9 +75,12 @@
         <v-select placeholder="filtering with fuse.js" label="title" :options="fuseSearchOptions" :filter="fuseSearch">
             <template slot="option" scope="option">
                 <strong>{{ option.title }}</strong><br>
-                <em>{{ `${option.author.firstName} ${option.author.lastName}` }}</em>
+                <em>{{ option.author.firstName + ' ' + option.author.lastName }}</em>
             </template>
         </v-select>
+        <v-select placeholder="Vue select with no options and a custom no-option span" >
+            <span slot="no-options">Custom no options message</span>
+        </v-select>
     </div>
 </body>
 
diff --git a/src/components/Select.vue b/src/components/Select.vue
@@ -917,8 +917,8 @@
       isOptionSelected(option) {
           let selected = false
           this.valueAsArray.forEach(value => {
-            if (typeof value === 'object') {
-              selected = this.optionObjectComparator(value, option)
+           if (typeof value === 'object' && this.optionObjectComparator(value, option)) {
+              selected = true
             } else if (value === option || value === option[this.index]) {
               selected = true
             }
@@ -986,11 +986,26 @@
           if (this.clearSearchOnBlur) {
             this.search = ''
           }
-          this.open = false
-          this.$emit('search:blur')
+          this.closeSearchOptions()
+          return
+        }
+        // Fixed bug where no-options message could not be closed
+        if(this.search.length === 0 && this.options.length === 0){
+          this.closeSearchOptions()
+          return
         }
       },
 
+      /**
+       * 'Private' function to close the search options
+       * @emits  {search:blur}
+       * @returns {void}
+       */
+      closeSearchOptions(){
+        this.open = false
+        this.$emit('search:blur')
+      },
+
       /**
        * Open the dropdown on focus.
        * @emits  {search:focus}
