Fix shentao#510, Adjust previously mergd fixes

Damian Dulisz · Damian Dulisz · commit bf4775fb7327 · 2017-09-27T22:43:08.000+02:00
diff --git a/docs/partials/_start.pug b/docs/partials/_start.pug
@@ -10,10 +10,10 @@ section.start(:style="gradient")
       a.typo__link(href="http://vuejs.org" target="_BLANK") Vue.js
     .badges
       img(src="https://img.shields.io/github/stars/monterail/vue-multiselect.svg?label=Stars")
-      img(src="https://camo.githubusercontent.com/d0e25b09a82bc4bfde9f1e048a092752eebbb4f3/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f6c6963656e73652d4d49542d626c75652e7376673f7374796c653d666c6174" alt="License" data-canonical-src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat")
-      img(src="https://camo.githubusercontent.com/64f9a2333bb303d34b1587e1436b24dee6a8e134/68747470733a2f2f696d672e736869656c64732e696f2f6e706d2f646d2f7675652d6d756c746973656c6563742e737667" alt="npm" data-canonical-src="https://img.shields.io/npm/dm/vue-multiselect.svg" style="max-width:100%;")
-      img(src="https://camo.githubusercontent.com/47ff0923e959e736113988e900268dfc7a601d3b/68747470733a2f2f636972636c6563692e636f6d2f67682f6d6f6e74657261696c2f7675652d6d756c746973656c6563742f747265652f6d61737465722e7376673f7374796c653d736869656c6426636972636c652d746f6b656e3d35633933316666323866643132353837363130663833353437326265636464353134643039636566" alt="Build Status" data-canonical-src="https://circleci.com/gh/monterail/vue-multiselect/tree/master.svg?style=shield&amp;circle-token=5c931ff28fd12587610f835472becdd514d09cef" style="max-width:100%;")
-      img(src="https://camo.githubusercontent.com/51bc9432092f4def26f97d24824c857ad5891c1c/68747470733a2f2f696d672e736869656c64732e696f2f67656d6e617369756d2f6d6f6e74657261696c2f7675652d6d756c746973656c6563742e7376673f7374796c653d666c6174" alt="No Dependencies" data-canonical-src="https://img.shields.io/gemnasium/monterail/vue-multiselect.svg?style=flat" style="max-width:100%;")
+      img(src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat" alt="License" data-canonical-src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat")
+      img(src="https://img.shields.io/npm/dm/vue-multiselect.svg" alt="npm" data-canonical-src="https://img.shields.io/npm/dm/vue-multiselect.svg" style="max-width:100%;")
+      img(src="https://circleci.com/gh/monterail/vue-multiselect/tree/2.0.svg?style=shield&circle-token=5c931ff28fd12587610f835472becdd514d09cef" alt="Build Status" data-canonical-src="https://circleci.com/gh/monterail/vue-multiselect/tree/master.svg?style=shield&amp;circle-token=5c931ff28fd12587610f835472becdd514d09cef" style="max-width:100%;")
+      img(src="https://img.shields.io/gemnasium/monterail/vue-multiselect.svg?style=flat" alt="No Dependencies" data-canonical-src="https://img.shields.io/gemnasium/monterail/vue-multiselect.svg?style=flat" style="max-width:100%;")
     .grid__row.grid__row--centered
       .grid__column.grid__unit--md-6
         .multiselect-example__container
diff --git a/docs/partials/examples/SingleSelectObject.vue b/docs/partials/examples/SingleSelectObject.vue
@@ -9,7 +9,7 @@ div
     placeholder="Select one",
     :options="options",
     :searchable="false",
-    :allow-empty="true"
+    :allow-empty="false"
   )
   pre.language-json
     code.
diff --git a/src/Multiselect.vue b/src/Multiselect.vue
@@ -53,15 +53,15 @@
         <span
           v-if="!searchable"
           class="multiselect__single"
-          @mousedown.prevent="toggle()"
+          @mousedown.prevent="toggle"
           v-text="currentOptionLabel">
         </span>
       </div>
       <transition name="multiselect">
         <div
           class="multiselect__content-wrapper"
           v-show="isOpen"
-          @focus="activate()"
+          @focus="activate"
           @mousedown.prevent
           :style="{ maxHeight: optimizedHeight + 'px' }"
           ref="list">
diff --git a/src/multiselectMixin.js b/src/multiselectMixin.js
@@ -221,12 +221,13 @@ export default {
       default: 'Press enter to create a tag'
     },
     /**
-     * Number of allowed selected options. No limit if false.
-     * @default False
+     * Number of allowed selected options. No limit if 0.
+     * @default 0
      * @type {Number}
     */
     max: {
-      type: Number
+      type: [Number, Boolean],
+      default: false
     },
     /**
      * Will be passed with all events as second param.
@@ -287,6 +288,9 @@ export default {
     if (!this.multiple && !this.clearOnSelect) {
       console.warn('[Vue-Multiselect warn]: ClearOnSelect and Multiple props can’t be both set to false.')
     }
+    if (!this.multiple && this.max) {
+      console.warn('[Vue-Multiselect warn]: Max prop should not be used when prop Multiple equals false.')
+    }
   },
   computed: {
     filteredOptions () {
@@ -335,17 +339,17 @@ export default {
     }
   },
   watch: {
-    ['internalValue'] (newVal, oldVal) {
+    internalValue (newVal, oldVal) {
       /* istanbul ignore else */
       if (this.resetAfter && this.internalValue.length) {
         this.search = ''
         this.internalValue = []
       }
     },
-    ['search'] () {
+    search () {
       this.$emit('search-change', this.search, this.id)
     },
-    ['value'] (value) {
+    value (value) {
       this.internalValue = this.getInternalValue(value)
     }
   },

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ div`
`9`	`9`	`placeholder="Select one",`
`10`	`10`	`:options="options",`
`11`	`11`	`:searchable="false",`
`12`		`- :allow-empty="true"`
	`12`	`+ :allow-empty="false"`
`13`	`13`	`)`
`14`	`14`	`pre.language-json`
`15`	`15`	`code.`