mirror of
https://github.com/Choices-js/Choices.git
synced 2024-06-08 08:52:19 +02:00
Merge branch 'master' of https://github.com/DarrenMack-OD/Choices into DarrenMack-OD-master
This commit is contained in:
commit
3c05016920
|
@ -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>
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
|
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue