mirror of
https://github.com/Choices-js/Choices.git
synced 2024-06-08 00:42:15 +02:00
Fixes #543
This commit is contained in:
parent
cbaf43232c
commit
cd8a83b7b0
|
@ -1,4 +1,4 @@
|
|||
/*! choices.js v9.0.1 | © 2019 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
|
||||
/*! choices.js v9.0.1 | © 2020 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
|
||||
(function webpackUniversalModuleDefinition(root, factory) {
|
||||
if(typeof exports === 'object' && typeof module === 'object')
|
||||
module.exports = factory();
|
||||
|
@ -1490,7 +1490,7 @@ function () {
|
|||
selected: !!option.selected,
|
||||
disabled: option.disabled || option.parentNode.disabled,
|
||||
placeholder: option.value === '' || option.hasAttribute('placeholder'),
|
||||
customProperties: option.dataset['custom-properties']
|
||||
customProperties: option.dataset.customProperties
|
||||
});
|
||||
});
|
||||
}
|
||||
|
@ -3276,7 +3276,7 @@ function () {
|
|||
isSelected: choice.selected,
|
||||
isDisabled: isOptDisabled,
|
||||
groupId: groupId,
|
||||
customProperties: choice.customProperties,
|
||||
customProperties: choice.dataset.customProperties,
|
||||
placeholder: choice.placeholder
|
||||
});
|
||||
};
|
||||
|
@ -3577,7 +3577,7 @@ function () {
|
|||
};
|
||||
|
||||
Choices.prototype._generatePlaceholderValue = function () {
|
||||
if (this._isSelectElement) {
|
||||
if (this._isSelectElement && this.passedElement.placeholderOption) {
|
||||
var placeholderOption = this.passedElement.placeholderOption;
|
||||
return placeholderOption ? placeholderOption.text : null;
|
||||
}
|
||||
|
|
4
public/assets/scripts/choices.min.js
vendored
4
public/assets/scripts/choices.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -255,7 +255,7 @@ class Choices {
|
|||
disabled: option.disabled || option.parentNode.disabled,
|
||||
placeholder:
|
||||
option.value === '' || option.hasAttribute('placeholder'),
|
||||
customProperties: option.dataset['custom-properties'],
|
||||
customProperties: option.dataset.customProperties,
|
||||
});
|
||||
});
|
||||
}
|
||||
|
@ -2060,7 +2060,7 @@ class Choices {
|
|||
isSelected: choice.selected,
|
||||
isDisabled: isOptDisabled,
|
||||
groupId,
|
||||
customProperties: choice.customProperties,
|
||||
customProperties: choice.dataset.customProperties,
|
||||
placeholder: choice.placeholder,
|
||||
});
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue