Version 4.1.4

This commit is contained in:
Josh Johnson 2019-01-24 19:42:26 +00:00
parent dc9e7eb44d
commit d02cdffcdb
4 changed files with 14 additions and 9 deletions

View file

@ -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) { (function webpackUniversalModuleDefinition(root, factory) {
//CommonJS2 //CommonJS2
if(typeof exports === 'object' && typeof module === 'object') 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)) { if (!(0, _utils.doKeysMatch)(this.config, _constants.DEFAULT_CONFIG)) {
console.warn('Unknown config option(s) passed'); 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'); return console.error('Passed element was of an invalid type');
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -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.1.3"> <link rel="stylesheet" href="assets/styles/base.min.css?version=4.1.4">
<!-- 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.1.3"> <link rel="stylesheet" href="assets/styles/choices.min.css?version=4.1.4">
<script src="assets/scripts/choices.min.js?version=4.1.3"></script> <script src="assets/scripts/choices.min.js?version=4.1.4"></script>
<!-- End Choices includes --> <!-- End Choices includes -->
<!--[if lt IE 9]> <!--[if lt IE 9]>