deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-06-09 09:22:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'feature/modularise-code' of github.com:jshjohnson/Choices into feature/modularise-code

Browse source
This commit is contained in:
Josh Johnson 2017-09-29 13:27:26 +01:00
parent 098f71172d 85bd985a5e
commit 498e45f6db
7 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -408,7 +408,7 @@ const example = new Choices(element, {
### renderSelectedChoices ### renderSelectedChoices
**Type:** `String` **Default:** `auto` **Type:** `String` **Default:** `auto`
**Input types affected:** `select-one`, `select-multiple` **Input types affected:** `select-multiple`
**Usage:** Whether selected choices should be removed from the list. By default choices are removed when they are selected in multiple select box. To always render choices pass `always`. **Usage:** Whether selected choices should be removed from the list. By default choices are removed when they are selected in multiple select box. To always render choices pass `always`.

2
package.json
View file

@ -74,7 +74,7 @@
}, },
"dependencies": { "dependencies": {
"classnames": "^2.2.5", "classnames": "^2.2.5",
"fuse.js": "^2.2.2", "fuse.js": "^3.1.0",
"redux": "^3.3.1" "redux": "^3.3.1"
}, },
"npmName": "choices.js", "npmName": "choices.js",

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

@ -428,7 +428,7 @@ return /******/ (function(modules) { // webpackBootstrap
if (_this.isSelectOneElement) { if (_this.isSelectOneElement) {
return choice.groupId === group.id; return choice.groupId === group.id;
} }
return choice.groupId === group.id && !choice.selected; return choice.groupId === group.id && (_this.config.renderSelectedChoices === 'always' || !choice.selected);
}); });
if (groupChoices.length >= 1) { if (groupChoices.length >= 1) {

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

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

@ -345,7 +345,7 @@ class Choices {
if (this.isSelectOneElement) { if (this.isSelectOneElement) {
return choice.groupId === group.id; return choice.groupId === group.id;
} }
return choice.groupId === group.id && !choice.selected; return choice.groupId === group.id && (this.config.renderSelectedChoices === 'always' || !choice.selected);
}); });
if (groupChoices.length >= 1) { if (groupChoices.length >= 1) {

2
src/scripts/src/reducers/choices.js
View file

@ -71,7 +71,7 @@ const choices = (state = [], action) => {
// Set active state based on whether choice is // Set active state based on whether choice is
// within filtered results // within filtered results
choice.active = filteredResults.some((result) => { choice.active = filteredResults.some((result) => {
if (result.item.id === choice.id) { if (result.id === choice.id) {
choice.score = result.score; choice.score = result.score;
return true; return true;
} }