deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-05-06 07:43:12 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DarrenMack-OD-master'

Browse source
This commit is contained in:
Josh Johnson 2019-03-29 09:09:27 +00:00
parent 0580a0433f 63e5b51683
commit 899e4b16bb
7 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
public/assets/scripts/choices.js
View file

@ -2114,13 +2114,13 @@ function () {
var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ''; var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
var replaceChoices = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false; var replaceChoices = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
if (!this._isSelectElement || !choices.length || !value) { if (!this._isSelectElement || !value) {
return this; return this;
} // Clear choices if needed } // Clear choices if needed
if (replaceChoices) { if (replaceChoices) {
this._clearChoices(); this.clearChoices();
} }
this.containerOuter.removeLoadingState(); this.containerOuter.removeLoadingState();
@ -2153,6 +2153,11 @@ function () {
return this; return this;
} }
}, {
key: "clearChoices",
value: function clearChoices() {
this._store.dispatch((0, _choices.clearChoices)());
}
}, { }, {
key: "clearStore", key: "clearStore",
value: function clearStore() { value: function clearStore() {
@ -3096,7 +3101,7 @@ function () {
var target = event.target, var target = event.target,
shiftKey = event.shiftKey; // If we have our mouse down on the scrollbar and are on IE11... shiftKey = event.shiftKey; // If we have our mouse down on the scrollbar and are on IE11...
if (target === this.choiceList && (0, _utils.isIE11)()) { if (this.choiceList.element.contains(target) && (0, _utils.isIE11)()) {
this._isScrollingOnIe = true; this._isScrollingOnIe = true;
} }
@ -3451,11 +3456,6 @@ function () {
}); });
} }
} }
}, {
key: "_clearChoices",
value: function _clearChoices() {
this._store.dispatch((0, _choices.clearChoices)());
}
}, { }, {
key: "_addGroup", key: "_addGroup",
value: function _addGroup(_ref15) { value: function _addGroup(_ref15) {

10
public/assets/scripts/choices.min.js vendored
View file

File diff suppressed because one or more lines are too long

10
public/index.html
View file

@ -16,16 +16,16 @@
<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=6.0.3"> <link rel="stylesheet" href="assets/styles/base.min.css?version=7.0.0">
<!-- End ignore these --> <!-- End ignore these -->
<!-- Optional includes --> <!-- Optional includes -->
<script src="https://cdn.polyfill.io/v2/polyfill.js?features=es5,fetch,Element.prototype.classList,requestAnimationFrame,Node.insertBefore,Node.firstChild,Object.assign"></script> <script src="https://polyfill.io/v3/polyfill.min.js?features=es5%2Ces6%2CArray.prototype.includes%2Cfetch"></script>
<!-- End optional includes --> <!-- End optional includes -->
<!-- Choices includes --> <!-- Choices includes -->
<link rel="stylesheet" href="assets/styles/choices.min.css?version=6.0.3"> <link rel="stylesheet" href="assets/styles/choices.min.css?version=7.0.0">
<script src="assets/scripts/choices.min.js?version=6.0.3"></script> <script src="assets/scripts/choices.min.js?version=7.0.0"></script>
<!-- End Choices includes --> <!-- End Choices includes -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
@ -344,7 +344,7 @@
var textEmailFilter = new Choices('#choices-text-email-filter', { var textEmailFilter = new Choices('#choices-text-email-filter', {
editItems: true, editItems: true,
addItemFilterFn: (value) => { addItemFilterFn: function (value) {
if (!value) { if (!value) {
return false; return false;
} }

6
public/test/select-multiple.html
View file

@ -16,12 +16,12 @@
<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=3.0.2"> <link rel="stylesheet" href="../assets/styles/base.min.css?version=6.0.3">
<!-- End ignore these --> <!-- End ignore these -->
<!-- Choices includes --> <!-- Choices includes -->
<link rel="stylesheet" href="../assets/styles/choices.min.css?version=3.0.2"> <link rel="stylesheet" href="../assets/styles/choices.min.css?version=6.0.3">
<script src="../assets/scripts/choices.min.js?version=2.8.8"></script> <script src="../assets/scripts/choices.min.js?version=6.0.3"></script>
<!-- End Choices includes --> <!-- End Choices includes -->
</head> </head>

6
public/test/select-one.html
View file

@ -16,12 +16,12 @@
<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=3.0.2"> <link rel="stylesheet" href="../assets/styles/base.min.css?version=6.0.3">
<!-- End ignore these --> <!-- End ignore these -->
<!-- Choices includes --> <!-- Choices includes -->
<link rel="stylesheet" href="../assets/styles/choices.min.css?version=3.0.2"> <link rel="stylesheet" href="../assets/styles/choices.min.css?version=6.0.3">
<script src="../assets/scripts/choices.min.js?version=2.8.8"></script> <script src="../assets/scripts/choices.min.js?version=6.0.3"></script>
<!-- End Choices includes --> <!-- End Choices includes -->
</head> </head>

6
public/test/text.html
View file

@ -16,12 +16,12 @@
<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=3.0.2"> <link rel="stylesheet" href="../assets/styles/base.min.css?version=6.0.3">
<!-- End ignore these --> <!-- End ignore these -->
<!-- Choices includes --> <!-- Choices includes -->
<link rel="stylesheet" href="../assets/styles/choices.min.css?version=3.0.2"> <link rel="stylesheet" href="../assets/styles/choices.min.css?version=6.0.3">
<script src="../assets/scripts/choices.min.js?version=2.8.8"></script> <script src="../assets/scripts/choices.min.js?version=6.0.3"></script>
<!-- End Choices includes --> <!-- End Choices includes -->
</head> </head>

2
src/scripts/choices.js
View file

@ -1390,7 +1390,7 @@ class Choices {
_onMouseDown(event) { _onMouseDown(event) {
const { target, shiftKey } = event; const { target, shiftKey } = event;
// If we have our mouse down on the scrollbar and are on IE11... // If we have our mouse down on the scrollbar and are on IE11...
if (target === this.choiceList && isIE11()) { if (this.choiceList.element.contains(target) && isIE11()) {
this._isScrollingOnIe = true; this._isScrollingOnIe = true;
} }