mirror of
https://github.com/Choices-js/Choices.git
synced 2024-06-19 22:25:09 +02:00
Rebase with master
This commit is contained in:
parent
85fe921471
commit
afd47f9b12
|
@ -1229,7 +1229,10 @@ class Choices {
|
||||||
// Check flag to filter search input
|
// Check flag to filter search input
|
||||||
if (this.config.searchChoices) {
|
if (this.config.searchChoices) {
|
||||||
// Filter available choices
|
// Filter available choices
|
||||||
this._searchChoices(value);
|
const results = this._searchChoices(value);
|
||||||
|
if (results) {
|
||||||
|
this.store.dispatch(filterChoices(results));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Trigger search event
|
// Trigger search event
|
||||||
triggerEvent(this.passedElement, 'search', {
|
triggerEvent(this.passedElement, 'search', {
|
||||||
|
|
11
index.html
11
index.html
|
@ -152,8 +152,8 @@
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
<h2>Single select input</h2>
|
<h2>Single select input</h2>
|
||||||
<label for="choices-single-default">Default</label>
|
<label for="choices-single-placeholder">Default</label>
|
||||||
<select class="form-control" data-trigger name="choices-single-default" id="choices-single-default" placeholder="This is a search placeholder">
|
<select class="form-control" data-trigger name="choices-single-placeholder" id="choices-single-placeholder" placeholder="This is a search placeholder">
|
||||||
<option selected disabled>This is a placeholder</option>
|
<option selected disabled>This is a placeholder</option>
|
||||||
<option value="Dropdown item 1">Dropdown item 1</option>
|
<option value="Dropdown item 1">Dropdown item 1</option>
|
||||||
<option value="Dropdown item 2">Dropdown item 2</option>
|
<option value="Dropdown item 2">Dropdown item 2</option>
|
||||||
|
@ -348,7 +348,6 @@
|
||||||
removeItemButton: true,
|
removeItemButton: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
/* Use label on event */
|
/* Use label on event */
|
||||||
var choicesSelect = new Choices('#choices-multiple-labels', {
|
var choicesSelect = new Choices('#choices-multiple-labels', {
|
||||||
search: false,
|
search: false,
|
||||||
|
@ -370,13 +369,15 @@
|
||||||
|
|
||||||
choicesSelect.passedElement.addEventListener('removeItem', function(event) {
|
choicesSelect.passedElement.addEventListener('removeItem', function(event) {
|
||||||
document.getElementById('message').innerHTML = 'You just removed "' + event.detail.label + '"';
|
document.getElementById('message').innerHTML = 'You just removed "' + event.detail.label + '"';
|
||||||
=======
|
});
|
||||||
|
|
||||||
var multipleAddItems = new Choices('#choices-multiple-add-items', {
|
var multipleAddItems = new Choices('#choices-multiple-add-items', {
|
||||||
addItems: true,
|
addItems: true,
|
||||||
duplicateItems: false,
|
duplicateItems: false,
|
||||||
>>>>>>> c348050... Add multiple select example
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var multipleAddItems = new Choices('#choices-single-placeholder');
|
||||||
|
|
||||||
var singleFetch = new Choices('#choices-single-remote-fetch', {
|
var singleFetch = new Choices('#choices-single-remote-fetch', {
|
||||||
placeholder: true,
|
placeholder: true,
|
||||||
placeholderValue: 'Pick an Arctic Monkeys record'
|
placeholderValue: 'Pick an Arctic Monkeys record'
|
||||||
|
|
Loading…
Reference in a new issue