mirror of
https://github.com/Choices-js/Choices.git
synced 2024-06-08 08:52:19 +02:00
Merge branch 'mike-robertson-master'
This commit is contained in:
commit
f433a5d3b0
|
@ -790,7 +790,7 @@ class Choices {
|
||||||
const isSelected = result.selected ? result.selected : false;
|
const isSelected = result.selected ? result.selected : false;
|
||||||
const isDisabled = result.disabled ? result.disabled : false;
|
const isDisabled = result.disabled ? result.disabled : false;
|
||||||
if (result.choices) {
|
if (result.choices) {
|
||||||
this._addGroup(result, index, value, label);
|
this._addGroup(result, (result.id || null), value, label);
|
||||||
} else {
|
} else {
|
||||||
this._addChoice(isSelected, isDisabled, result[value], result[label]);
|
this._addChoice(isSelected, isDisabled, result[value], result[label]);
|
||||||
}
|
}
|
||||||
|
@ -1120,7 +1120,7 @@ class Choices {
|
||||||
const isSelected = result.selected ? result.selected : false;
|
const isSelected = result.selected ? result.selected : false;
|
||||||
const isDisabled = result.disabled ? result.disabled : false;
|
const isDisabled = result.disabled ? result.disabled : false;
|
||||||
if (result.choices) {
|
if (result.choices) {
|
||||||
this._addGroup(result, index, value, label);
|
this._addGroup(result, (result.id || null), value, label);
|
||||||
} else {
|
} else {
|
||||||
this._addChoice(isSelected, isDisabled, result[value], result[label]);
|
this._addChoice(isSelected, isDisabled, result[value], result[label]);
|
||||||
}
|
}
|
||||||
|
@ -1976,7 +1976,7 @@ class Choices {
|
||||||
*/
|
*/
|
||||||
_addGroup(group, id, valueKey = 'value', labelKey = 'label') {
|
_addGroup(group, id, valueKey = 'value', labelKey = 'label') {
|
||||||
const groupChoices = isType('Object', group) ? group.choices : Array.from(group.getElementsByTagName('OPTION'));
|
const groupChoices = isType('Object', group) ? group.choices : Array.from(group.getElementsByTagName('OPTION'));
|
||||||
const groupId = id;
|
const groupId = id ? id : Math.floor(new Date().valueOf() * Math.random());
|
||||||
const isDisabled = group.disabled ? group.disabled : false;
|
const isDisabled = group.disabled ? group.disabled : false;
|
||||||
|
|
||||||
if (groupChoices) {
|
if (groupChoices) {
|
||||||
|
@ -2172,8 +2172,8 @@ class Choices {
|
||||||
this.isSearching = false;
|
this.isSearching = false;
|
||||||
|
|
||||||
if (passedGroups && passedGroups.length) {
|
if (passedGroups && passedGroups.length) {
|
||||||
passedGroups.forEach((group, index) => {
|
passedGroups.forEach((group) => {
|
||||||
this._addGroup(group, index);
|
this._addGroup(group, (group.id || null));
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const passedOptions = Array.from(this.passedElement.options);
|
const passedOptions = Array.from(this.passedElement.options);
|
||||||
|
|
Loading…
Reference in a new issue