Fix shentao#208, shentao#187

Damian Dulisz · Damian Dulisz · commit 75c7711dfe79 · 2017-01-22T16:22:02.000+01:00
Also remove throttle from the docs.
diff --git a/docs/main.js b/docs/main.js
@@ -6,19 +6,6 @@ import Multiselect from 'vue-multiselect'
 
 import './docs.scss'
 
-function throttle (callback, limit) {
-  var wait = false
-  return function () {
-    if (!wait) {
-      callback.call()
-      wait = true
-      setTimeout(function () {
-        wait = false
-      }, limit)
-    }
-  }
-}
-
 function calculateNavPositions () {
   sections = Array
     .from(document.querySelectorAll('[data-section]'))
@@ -92,7 +79,7 @@ new Vue({
   },
   mounted () {
     this.adjustNav()
-    window.addEventListener('scroll', throttle(this.adjustNav, 50))
+    window.addEventListener('scroll', this.adjustNav)
     setTimeout(function () {
       calculateNavPositions()
     }, 1000)
diff --git a/src/Multiselect.vue b/src/Multiselect.vue
@@ -44,7 +44,8 @@
           @keyup.esc="deactivate()"
           @keydown.down.prevent="pointerForward()"
           @keydown.up.prevent="pointerBackward()"
-          @keydown.enter.tab.stop.self.prevent="addPointerElement($event)"
+          @keydown.enter.prevent
+          @keydown.enter.tab.stop.self="addPointerElement($event)"
           @keydown.delete="removeLastElement()"
           class="multiselect__input"/>
         <span
diff --git a/src/multiselectMixin.js b/src/multiselectMixin.js
@@ -3,7 +3,7 @@ import deepClone from './utils'
 function includes (str, query) {
   if (!str) return false
   const text = str.toString().toLowerCase()
-  return text.indexOf(query) !== -1
+  return text.indexOf(query.trim()) !== -1
 }
 
 function filterOptions (options, search, label) {
@@ -274,7 +274,7 @@ module.exports = {
       const search = this.search || ''
       const normalizedSearch = search.toLowerCase()
 
-      let options = this.options
+      let options = this.options.concat()
 
       if (this.internalSearch) {
         options = this.groupValues
@@ -306,14 +306,14 @@ module.exports = {
         : options.map(element => element.toString().toLowerCase())
     },
     currentOptionLabel () {
-      return this.getOptionLabel(this.internalValue[0]) + ''
+      return this.multiple ? '' : this.getOptionLabel(this.internalValue[0]) + ''
     }
   },
   watch: {
-    'internalValue' () {
-      if (this.resetAfter) {
-        this.internalValue = []
+    'internalValue' (newVal, oldVal) {
+      if (this.resetAfter && this.internalValue.length) {
         this.search = ''
+        this.internalValue = []
       }
       this.adjustSearch()
     },
@@ -328,6 +328,11 @@ module.exports = {
     }
   },
   methods: {
+    getValue () {
+      return this.multiple
+        ? deepClone(this.internalValue)
+        : deepClone(this.internalValue[0])
+    },
     /**
      * Filters and then flattens the options list
      * @param  {Array}
@@ -351,7 +356,7 @@ module.exports = {
       )(options)
     },
     updateSearch (query) {
-      this.search = query.trim().toString()
+      this.search = query.toString()
     },
     /**
      * Finds out if the given query is already present
@@ -424,10 +429,7 @@ module.exports = {
           this.internalValue = [option]
         }
         this.$emit('select', deepClone(option), this.id)
-        const value = this.multiple
-          ? this.internalValue
-          : this.internalValue[0]
-        this.$emit('input', deepClone(value), this.id)
+        this.$emit('input', this.getValue(), this.id)
 
         if (this.closeOnSelect) this.deactivate()
       }
@@ -451,10 +453,7 @@ module.exports = {
 
       this.internalValue.splice(index, 1)
       this.$emit('remove', deepClone(option), this.id)
-      const value = this.multiple
-        ? this.internalValue
-        : this.internalValue[0]
-      this.$emit('input', deepClone(value), this.id)
+      this.$emit('input', this.getValue(), this.id)
     },
     /**
      * Calls this.removeElement() with the last element
@@ -510,10 +509,7 @@ module.exports = {
       } else {
         this.$el.blur()
       }
-      const value = this.multiple
-        ? this.internalValue
-        : this.internalValue[0]
-      this.$emit('close', deepClone(value), this.id)
+      this.$emit('close', this.getValue(), this.id)
     },
     /**
      * Adjusts the Search property to equal the correct value
