mirror of
https://github.com/Choices-js/Choices.git
synced 2024-04-27 19:42:51 +02:00
Version 4.1.4
This commit is contained in:
parent
dc9e7eb44d
commit
d02cdffcdb
|
@ -1,4 +1,4 @@
|
|||
/*! choices.js v4.1.3 | (c) 2018 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
|
||||
/*! choices.js v4.1.4 | (c) 2019 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
|
||||
(function webpackUniversalModuleDefinition(root, factory) {
|
||||
//CommonJS2
|
||||
if(typeof exports === 'object' && typeof module === 'object')
|
||||
|
@ -2110,7 +2110,12 @@ var Choices = function () {
|
|||
}
|
||||
}
|
||||
|
||||
this.config = _deepmerge2.default.all([_constants.DEFAULT_CONFIG, Choices.userDefaults, userConfig]);
|
||||
this.config = _deepmerge2.default.all([_constants.DEFAULT_CONFIG, Choices.userDefaults, userConfig],
|
||||
// When merging array configs, replace with a copy of the userConfig array,
|
||||
// instead of concatenating with the default array
|
||||
{ arrayMerge: function arrayMerge(destinationArray, sourceArray) {
|
||||
return [].concat(_toConsumableArray(sourceArray));
|
||||
} });
|
||||
|
||||
if (!(0, _utils.doKeysMatch)(this.config, _constants.DEFAULT_CONFIG)) {
|
||||
console.warn('Unknown config option(s) passed');
|
||||
|
@ -2145,7 +2150,7 @@ var Choices = function () {
|
|||
});
|
||||
}
|
||||
|
||||
if (!passedElement) {
|
||||
if (!this.passedElement) {
|
||||
return console.error('Passed element was of an invalid type');
|
||||
}
|
||||
|
||||
|
|
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">
|
||||
|
||||
<!-- Ignore these -->
|
||||
<link rel="stylesheet" href="assets/styles/base.min.css?version=4.1.3">
|
||||
<link rel="stylesheet" href="assets/styles/base.min.css?version=4.1.4">
|
||||
<!-- End ignore these -->
|
||||
|
||||
<!-- Optional includes -->
|
||||
|
@ -24,8 +24,8 @@
|
|||
<!-- End optional includes -->
|
||||
|
||||
<!-- Choices includes -->
|
||||
<link rel="stylesheet" href="assets/styles/choices.min.css?version=4.1.3">
|
||||
<script src="assets/scripts/choices.min.js?version=4.1.3"></script>
|
||||
<link rel="stylesheet" href="assets/styles/choices.min.css?version=4.1.4">
|
||||
<script src="assets/scripts/choices.min.js?version=4.1.4"></script>
|
||||
<!-- End Choices includes -->
|
||||
|
||||
<!--[if lt IE 9]>
|
||||
|
|
Loading…
Reference in a new issue