2
0
mirror of https://github.com/tenrok/vue-select.git synced 2026-06-22 10:30:34 +03:00

Merge pull request #297 from meteorlxy/patch-2

Add loadingText and noMatchText.
This commit is contained in:
Jeff
2017-10-01 15:34:23 -07:00
committed by GitHub
+5 -4
View File
@@ -350,7 +350,7 @@
* If you are using an array of objects, vue-select will look for * If you are using an array of objects, vue-select will look for
* a `label` key (ex. [{label: 'This is Foo', value: 'foo'}]). A * a `label` key (ex. [{label: 'This is Foo', value: 'foo'}]). A
* custom label key can be set with the `label` prop. * custom label key can be set with the `label` prop.
* @type {Object} * @type {Array}
*/ */
options: { options: {
type: Array, type: Array,
@@ -389,7 +389,7 @@
/** /**
* Equivalent to the `multiple` attribute on a `<select>` input. * Equivalent to the `multiple` attribute on a `<select>` input.
* @type {Object} * @type {Boolean}
*/ */
multiple: { multiple: {
type: Boolean, type: Boolean,
@@ -398,7 +398,7 @@
/** /**
* Equivalent to the `placeholder` attribute on an `<input>`. * Equivalent to the `placeholder` attribute on an `<input>`.
* @type {Object} * @type {String}
*/ */
placeholder: { placeholder: {
type: String, type: String,
@@ -447,6 +447,7 @@
/** /**
* Callback to generate the label text. If {option} * Callback to generate the label text. If {option}
* is an object, returns option[this.label] by default. * is an object, returns option[this.label] by default.
* @type {Function}
* @param {Object || String} option * @param {Object || String} option
* @return {String} * @return {String}
*/ */
@@ -467,7 +468,7 @@
* value(s) change. When integrating with Vuex, use this callback to trigger * value(s) change. When integrating with Vuex, use this callback to trigger
* an action, rather than using :value.sync to retreive the selected value. * an action, rather than using :value.sync to retreive the selected value.
* @type {Function} * @type {Function}
* @default {null} * @param {Object || String} val
*/ */
onChange: { onChange: {
type: Function, type: Function,