deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-05-17 21:16:34 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #255 from maximmig/feature/modularise-code

Browse source 
Addressing issue #224
This commit is contained in:
Josh Johnson 2017-09-19 13:00:05 +01:00 committed by GitHub
parent 26d4c2304e 020905676a
commit a048fced4f
4 changed files with 1261 additions and 773 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1968
src/scripts/dist/choices.js vendored
View file

File diff suppressed because it is too large Load diff

2
src/scripts/dist/choices.js.map vendored
View file

File diff suppressed because one or more lines are too long

6
src/scripts/dist/choices.min.js vendored
View file

File diff suppressed because one or more lines are too long

58
src/scripts/src/choices.js
View file

@ -505,6 +505,13 @@ class Choices {
// If we have grouped options
if (activeGroups.length >= 1 && this.isSearching !== true) {
// If we have a placeholder choice along with groups
const activePlaceholders = activeChoices.filter(
activeChoice => activeChoice.placeholder === true && activeChoice.groupId === -1,
);
if (activePlaceholders.length >= 1) {
choiceListFragment = this.renderChoices(activePlaceholders, choiceListFragment);
}
choiceListFragment = this.renderGroups(activeGroups, activeChoices, choiceListFragment);
} else if (activeChoices.length >= 1) {
choiceListFragment = this.renderChoices(activeChoices, choiceListFragment);
@ -2628,6 +2635,19 @@ class Choices {
this.isSearching = false;
if (passedGroups && passedGroups.length) {
// If we have a placeholder option
const placeholderChoice = this.passedElement.querySelector('option[placeholder]');
if (placeholderChoice && placeholderChoice.parentNode.tagName === 'SELECT') {
this._addChoice(
placeholderChoice.value,
placeholderChoice.innerHTML,
placeholderChoice.selected,
placeholderChoice.disabled,
undefined,
undefined,
/* placeholder */ true,
);
}
passedGroups.forEach((group) => {
this._addGroup(group, (group.id || null));
});
@ -2657,24 +2677,28 @@ class Choices {
// Add each choice
allChoices.forEach((choice, index) => {
// Pre-select first choice if it's a single select
if (this.isSelectOneElement) {
// If there is a selected choice already or the choice is not
// the first in the array, add each choice normally
// Otherwise pre-select the first choice in the array
const shouldPreselect = (!hasSelectedChoice || (hasSelectedChoice && index === 0));
const isSelected = shouldPreselect ? true : choice.selected;
const isDisabled = shouldPreselect ? false : choice.disabled;
if (this.isSelectElement) {
// If the choice is actually a group
if (choice.choices) {
this._addGroup(choice, choice.id || null);
} else {
// If there is a selected choice already or the choice is not
// the first in the array, add each choice normally
// Otherwise pre-select the first choice in the array if it's a single select
const shouldPreselect = this.isSelectOneElement && !hasSelectedChoice && index === 0;
const isSelected = shouldPreselect ? true : choice.selected;
const isDisabled = shouldPreselect ? false : choice.disabled;
this._addChoice(
choice.value,
choice.label,
isSelected,
isDisabled,
undefined,
choice.customProperties,
choice.placeholder,
);
this._addChoice(
choice.value,
choice.label,
isSelected,
isDisabled,
undefined,
choice.customProperties,
choice.placeholder,
);
}
} else {
this._addChoice(
choice.value,