mirror of
https://github.com/Choices-js/Choices.git
synced 2024-06-15 20:25:18 +02:00
Version 4.1.0
This commit is contained in:
parent
cd4454201b
commit
3431d03ef0
|
@ -1,4 +1,4 @@
|
||||||
/*! choices.js v4.0.6 | (c) 2018 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
|
/*! choices.js v4.1.0 | (c) 2018 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
|
||||||
(function webpackUniversalModuleDefinition(root, factory) {
|
(function webpackUniversalModuleDefinition(root, factory) {
|
||||||
//CommonJS2
|
//CommonJS2
|
||||||
if(typeof exports === 'object' && typeof module === 'object')
|
if(typeof exports === 'object' && typeof module === 'object')
|
||||||
|
@ -3002,8 +3002,11 @@ var Choices = function () {
|
||||||
var isLoading = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
|
var isLoading = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
|
||||||
|
|
||||||
var placeholderItem = this.itemList.getChild('.' + this.config.classNames.placeholder);
|
var placeholderItem = this.itemList.getChild('.' + this.config.classNames.placeholder);
|
||||||
|
|
||||||
if (isLoading) {
|
if (isLoading) {
|
||||||
|
this.disable();
|
||||||
this.containerOuter.addLoadingState();
|
this.containerOuter.addLoadingState();
|
||||||
|
|
||||||
if (this._isSelectOneElement) {
|
if (this._isSelectOneElement) {
|
||||||
if (!placeholderItem) {
|
if (!placeholderItem) {
|
||||||
placeholderItem = this._getTemplate('placeholder', this.config.loadingText);
|
placeholderItem = this._getTemplate('placeholder', this.config.loadingText);
|
||||||
|
@ -3015,6 +3018,7 @@ var Choices = function () {
|
||||||
this.input.placeholder = this.config.loadingText;
|
this.input.placeholder = this.config.loadingText;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
this.enable();
|
||||||
this.containerOuter.removeLoadingState();
|
this.containerOuter.removeLoadingState();
|
||||||
|
|
||||||
if (this._isSelectOneElement) {
|
if (this._isSelectOneElement) {
|
||||||
|
|
File diff suppressed because one or more lines are too long
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
|
@ -16,7 +16,7 @@
|
||||||
<meta name="theme-color" content="#ffffff">
|
<meta name="theme-color" content="#ffffff">
|
||||||
|
|
||||||
<!-- Ignore these -->
|
<!-- Ignore these -->
|
||||||
<link rel="stylesheet" href="assets/styles/base.min.css?version=4.0.6">
|
<link rel="stylesheet" href="assets/styles/base.min.css?version=4.1.0">
|
||||||
<!-- End ignore these -->
|
<!-- End ignore these -->
|
||||||
|
|
||||||
<!-- Optional includes -->
|
<!-- Optional includes -->
|
||||||
|
@ -24,8 +24,8 @@
|
||||||
<!-- End optional includes -->
|
<!-- End optional includes -->
|
||||||
|
|
||||||
<!-- Choices includes -->
|
<!-- Choices includes -->
|
||||||
<link rel="stylesheet" href="assets/styles/choices.min.css?version=4.0.6">
|
<link rel="stylesheet" href="assets/styles/choices.min.css?version=4.1.0">
|
||||||
<script src="assets/scripts/choices.min.js?version=4.0.6"></script>
|
<script src="assets/scripts/choices.min.js?version=4.1.0"></script>
|
||||||
<!-- End Choices includes -->
|
<!-- End Choices includes -->
|
||||||
|
|
||||||
<!--[if lt IE 9]>
|
<!--[if lt IE 9]>
|
||||||
|
|
Loading…
Reference in a new issue