Skip to content

Commit a81a990

Browse files
committed
Merge branch 'master' into 1817-update-dependencies-and-underlining-node-version-from-1418-to-22
# Conflicts: # package-lock.json
2 parents 02ddb2f + f86e2e1 commit a81a990

15 files changed

+26
-20
lines changed

documentation/src/components/MultiselectExample.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<template>
22
<div>
3-
<multiselect :options="badges" v-model="value"
3+
<multiselect :options="badges"
4+
v-model="value"
45
label="name"
6+
id="badges"
57
track-by="name"
68
placeholder="Pick badges"
79
:multiple="true"

documentation/src/components/NavMenu.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<ul class="list" :class="{ 'list--sticky': isNavSticky }">
33
<multiselect class="list__multiselect" :options="versions" :model-value="version" :allow-empty="false"
4-
:searchable="false"
4+
id="version" :searchable="false"
55
@update:model-value="pickVersion" select-label="Go to" deselect-label=""
6-
selected-label=""></multiselect>
6+
selected-label="" aria-label="pick vue-multiselect version"></multiselect>
77
<li class="list__heading">Setup</li>
88
<li class="list__element"><a href="#sub-getting-started" class="link list__link" :class="{ 'list__link--active': currentPosition === 'sub-getting-started' }">Getting Started</a></li>
99
<li class="list__element"><a href="#sub-migration-guide" class="link list__link" :class="{ 'list__link--active': currentPosition === 'sub-migration-guide' }">Migration Guide</a></li>
@@ -30,7 +30,7 @@
3030
<li class="list__element"><a target="_BLANK" href="https://vuelidate.netlify.com"
3131
class="link list__link">Vuelidate<img
3232
src="https://img.shields.io/github/stars/vuelidate/vuelidate.svg?style=social&amp;label=Stars"
33-
class="list__img"><span class="list__desc">Simple model-based validation plugin for Vue.js</span></a></li>
33+
class="list__img" alt="vuelidate library"><span class="list__desc">Simple model-based validation plugin for Vue.js</span></a></li>
3434
</ul>
3535
</template>
3636
<script>

documentation/src/components/_start.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<section class="start" :style="gradient">
33
<div class="center-vertically">
4-
<h1 class="typo__h1"><img class="logo" src="/assets/vue-logo.png"/>Vue-multiselect<small class="version">{{version}}</small></h1>
4+
<h1 class="typo__h1"><img class="logo" src="/assets/vue-logo.png" alt="vuejs logo"/>Vue-multiselect<small class="version">{{version}}</small></h1>
55
<h3 class="typo__h3">The most complete selecting solution for <a class="typo__link" href="http://vuejs.org" target="_BLANK">Vue.js</a></h3>
6-
<div class="badges"><img src="https://img.shields.io/github/stars/shentao/vue-multiselect.svg?label=Stars" /><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://img.shields.io/badge/dependencies-none-brightgreen.svg?style=flat" alt="No Dependencies" data-canonical-src="https://img.shields.io/badge/dependencies-none-brightgreen.svg?style=flat" style="max-width:100%;" /></div>
6+
<div class="badges"><img src="https://img.shields.io/github/stars/shentao/vue-multiselect.svg?label=Stars" alt="vue-multiselect library github stars" /><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://img.shields.io/badge/dependencies-none-brightgreen.svg?style=flat" alt="No Dependencies" data-canonical-src="https://img.shields.io/badge/dependencies-none-brightgreen.svg?style=flat" style="max-width:100%;" /></div>
77
<div class="grid__row grid__row--centered">
88
<div class="grid__column grid__unit--md-6">
99
<div class="multiselect-example__container">

documentation/src/components/example-code/ActionDispatcher.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div>
33
<label class="typo__label">Open console to see logs.</label>
4-
<multiselect placeholder="Pick action" :options="actions" :searchable="false" :reset-after="true" @select="dispatchAction"></multiselect>
4+
<multiselect id="action-dispatcher" placeholder="Pick action" :options="actions" :searchable="false" :reset-after="true" @select="dispatchAction" aria-label="pick a action"></multiselect>
55
</div>
66
</template>
77

documentation/src/components/example-code/CustomConfiguration.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div :class="{ 'invalid': isInvalid }">
33
<label class="typo__label">Customized multiselect</label>
4-
<multiselect placeholder="Pick at least one" select-label="Enter doesn’t work here!" :model-value="value" :options="options" :multiple="true" :searchable="true" :allow-empty="false" :prevent-autofocus="true" :hide-selected="true" :max-height="150" :max="3" :disabled="isDisabled" :block-keys="['Tab', 'Enter']" @update:modelValue="onChange" @close="onTouch" @select="onSelect"></multiselect>
4+
<multiselect id="custom-configuration" placeholder="Pick at least one" select-label="Enter doesn’t work here!" :model-value="value" :options="options" :multiple="true" :searchable="true" :allow-empty="false" :prevent-autofocus="true" :hide-selected="true" :max-height="150" :max="3" :disabled="isDisabled" :block-keys="['Tab', 'Enter']" @update:modelValue="onChange" @close="onTouch" @select="onSelect"></multiselect>
55
<label class="typo__label form__label" v-show="isInvalid">Must have at least one value</label>
66
</div>
77
</template>

documentation/src/components/example-code/CustomOptions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div><label class="typo__label">Custom option template</label>
3-
<multiselect v-model="value" placeholder="Fav No Man’s Sky path" label="title" track-by="title" :options="options"
3+
<multiselect id="custom-options" v-model="value" placeholder="Fav No Man’s Sky path" label="title" track-by="title" :options="options"
44
:option-height="104" :custom-label="customLabel" :show-labels="false">
55
<template #singleLabel="props"><img class="option__image" :src="props.option.img"
66
alt="No Man’s Sky"/><span class="option__desc"><span

documentation/src/components/example-code/MultiSelect.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div><label class="typo__label">Simple select / dropdown</label>
3-
<multiselect v-model="value" :options="options" :multiple="true" :close-on-select="false" :clear-on-select="false"
3+
<multiselect id="multiselect" v-model="value" :options="options" :multiple="true" :close-on-select="false" :clear-on-select="false"
44
:preserve-search="true" placeholder="Pick some" label="name" track-by="name" :preselect-first="true">
55
<template #selection="{ values, search, isOpen }">
66
<span class="multiselect__single"

documentation/src/components/example-code/OptionGroups.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div><label class="typo__label">Groups</label>
3-
<multiselect v-model="value" :options="options" :multiple="true" group-values="libs" group-label="language"
3+
<multiselect id="option-groups" v-model="value" :options="options" :multiple="true" group-values="libs" group-label="language"
44
:group-select="true" placeholder="Type to search" track-by="name" label="name"><template v-slot:noResult>Oops! No elements found. Consider changing the search query.</template>
55
</multiselect>
66
<pre class="language-json"><code>{{ value }}</code></pre>

documentation/src/components/example-code/ProgrammaticControl.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<button @click="close" class="button button-small">Close</button>
66
<pre>Multiselect Open: {{ isOpen }}</pre>
77
<label class="typo__label">Controlling multiselect programmatically</label>
8-
<multiselect ref="multiselect" placeholder="Pick at least one" :value="value" :options="options" :multiple="true"
8+
<multiselect id="programmatic-control" ref="multiselect" placeholder="Pick at least one" :value="value" :options="options" :multiple="true"
99
:searchable="true" :allow-empty="false" :hide-selected="true" :max-height="150" :max="3"
1010
@open="isOpen = true" @close="isOpen = false"></multiselect>
1111
</div>

documentation/src/components/example-code/SingleSelectObject.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<template>
22
<div><label class="typo__label">Single select / dropdown</label>
3-
<multiselect v-model="value" deselect-label="Can't remove this value" track-by="name" label="name"
4-
placeholder="Select one" :options="options" :searchable="false" :allow-empty="false">
3+
<multiselect id="single-select-object" v-model="value" deselect-label="Can't remove this value" track-by="name" label="name"
4+
placeholder="Select one" :options="options" :searchable="false" :allow-empty="false"
5+
aria-label="pick a value">
56
<template v-slot:singleLabel="{ option }"><strong>{{ option.name }}</strong> is written in <strong>
67
{{ option.language }}</strong></template>
78
</multiselect>

0 commit comments

Comments
 (0)