mirror of
https://github.com/Choices-js/Choices.git
synced 2024-06-19 22:25:09 +02:00
gUpdate dist files
This commit is contained in:
parent
7a784270b2
commit
a5c7336bdb
31
assets/scripts/dist/choices.js
vendored
31
assets/scripts/dist/choices.js
vendored
|
@ -1642,6 +1642,7 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
var canAddItem = _this16._canAddItem(activeItems, value);
|
var canAddItem = _this16._canAddItem(activeItems, value);
|
||||||
=======
|
=======
|
||||||
if (target.value) {
|
if (target.value) {
|
||||||
|
<<<<<<< HEAD
|
||||||
var value = _this17.input.value;
|
var value = _this17.input.value;
|
||||||
var canAddItem = _this17._canAddItem(activeItems, value);
|
var canAddItem = _this17._canAddItem(activeItems, value);
|
||||||
>>>>>>> 291143b... Add dist files
|
>>>>>>> 291143b... Add dist files
|
||||||
|
@ -1661,6 +1662,16 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
// Track whether we will end up adding an item
|
// Track whether we will end up adding an item
|
||||||
var willAddItem = _this17.isTextElement || _this17.isSelectElement && _this17.config.addItems;
|
var willAddItem = _this17.isTextElement || _this17.isSelectElement && _this17.config.addItems;
|
||||||
>>>>>>> acb2451... Update dist files, after FF from main repo
|
>>>>>>> acb2451... Update dist files, after FF from main repo
|
||||||
|
=======
|
||||||
|
(function () {
|
||||||
|
var value = _this17.input.value;
|
||||||
|
var canAddItem = _this17._canAddItem(activeItems, value);
|
||||||
|
|
||||||
|
// All is good, add
|
||||||
|
if (canAddItem.response) {
|
||||||
|
// Track whether we will end up adding an item
|
||||||
|
var willAddItem = _this17.isTextElement || _this17.isSelectElement && _this17.config.addItems;
|
||||||
|
>>>>>>> c4dd94f... Update dist files
|
||||||
|
|
||||||
if (willAddItem) {
|
if (willAddItem) {
|
||||||
if (hasActiveDropdown) {
|
if (hasActiveDropdown) {
|
||||||
|
@ -1669,11 +1680,22 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
|
|
||||||
if (_this17.isTextElement) {
|
if (_this17.isTextElement) {
|
||||||
_this17._addItem(value);
|
_this17._addItem(value);
|
||||||
} else if (_this17.config.addItems) {
|
} else {
|
||||||
|
var isUnique = void 0;
|
||||||
|
if (!duplicateItems) {
|
||||||
|
existingChoice = !_this17.store.getItems().filter(function (item) {
|
||||||
|
return item.value === value.trim();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (duplicateItems) {
|
||||||
_this17._addChoice(true, false, value, value);
|
_this17._addChoice(true, false, value, value);
|
||||||
|
} else {
|
||||||
|
_this17._addItem(existingChoice.value, existingChoice.label, existingChoice.id);
|
||||||
|
}
|
||||||
_this17.containerOuter.focus();
|
_this17.containerOuter.focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
_this17._triggerChange(value);
|
_this17._triggerChange(value);
|
||||||
_this17.clearInput(_this17.passedElement);
|
_this17.clearInput(_this17.passedElement);
|
||||||
|
@ -1684,6 +1706,13 @@ return /******/ (function(modules) { // webpackBootstrap
|
||||||
}
|
}
|
||||||
>>>>>>> acb2451... Update dist files, after FF from main repo
|
>>>>>>> acb2451... Update dist files, after FF from main repo
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
_this17._triggerChange(value);
|
||||||
|
_this17.clearInput(_this17.passedElement);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})();
|
||||||
|
>>>>>>> c4dd94f... Update dist files
|
||||||
}
|
}
|
||||||
|
|
||||||
if (target.hasAttribute('data-button')) {
|
if (target.hasAttribute('data-button')) {
|
||||||
|
|
4
assets/scripts/dist/choices.js.map
vendored
4
assets/scripts/dist/choices.js.map
vendored
File diff suppressed because one or more lines are too long
5
assets/scripts/dist/choices.min.js
vendored
5
assets/scripts/dist/choices.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue