Merge branch 'DarrenMack-OD-master'

Choices-js · Mar 29, 2019 · 899e4b1 · 899e4b1
2 parents 0580a04 + 63e5b51
commit 899e4b1
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/public/assets/scripts/choices.js b/public/assets/scripts/choices.js
@@ -2114,13 +2114,13 @@ function () {
       var label = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
       var replaceChoices = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
-      if (!this._isSelectElement || !choices.length || !value) {
+      if (!this._isSelectElement || !value) {
         return this;
       } // Clear choices if needed
 
 
       if (replaceChoices) {
-        this._clearChoices();
+        this.clearChoices();
       }
 
       this.containerOuter.removeLoadingState();
@@ -2153,6 +2153,11 @@ function () {
 
       return this;
     }
+  }, {
+    key: "clearChoices",
+    value: function clearChoices() {
+      this._store.dispatch((0, _choices.clearChoices)());
+    }
   }, {
     key: "clearStore",
     value: function clearStore() {
@@ -3096,7 +3101,7 @@ function () {
       var target = event.target,
           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;
       }
 
@@ -3451,11 +3456,6 @@ function () {
         });
       }
     }
-  }, {
-    key: "_clearChoices",
-    value: function _clearChoices() {
-      this._store.dispatch((0, _choices.clearChoices)());
-    }
   }, {
     key: "_addGroup",
     value: function _addGroup(_ref15) {

diff --git a/public/assets/scripts/choices.min.js b/public/assets/scripts/choices.min.js
diff --git a/public/index.html b/public/index.html
@@ -16,16 +16,16 @@
   <meta name="theme-color" content="#ffffff">
 
   <!-- 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 -->
 
   <!-- 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 -->
 
   <!-- Choices includes -->
-  <link rel="stylesheet" href="assets/styles/choices.min.css?version=6.0.3">
-  <script src="assets/scripts/choices.min.js?version=6.0.3"></script>
+  <link rel="stylesheet" href="assets/styles/choices.min.css?version=7.0.0">
+  <script src="assets/scripts/choices.min.js?version=7.0.0"></script>
   <!-- End Choices includes -->
 
   <!--[if lt IE 9]>
@@ -344,7 +344,7 @@ <h2>Form interaction</h2>
 
       var textEmailFilter = new Choices('#choices-text-email-filter', {
         editItems: true,
-        addItemFilterFn: (value) => {
+        addItemFilterFn: function (value) {
           if (!value) {
             return false;
           }

diff --git a/public/test/select-multiple.html b/public/test/select-multiple.html
@@ -16,12 +16,12 @@
   <meta name="theme-color" content="#ffffff">
 
   <!-- 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 -->
 
   <!-- Choices includes -->
-  <link rel="stylesheet" href="../assets/styles/choices.min.css?version=3.0.2">
-  <script src="../assets/scripts/choices.min.js?version=2.8.8"></script>
+  <link rel="stylesheet" href="../assets/styles/choices.min.css?version=6.0.3">
+  <script src="../assets/scripts/choices.min.js?version=6.0.3"></script>
   <!-- End Choices includes -->
   </head>
 

diff --git a/public/test/select-one.html b/public/test/select-one.html
@@ -16,12 +16,12 @@
   <meta name="theme-color" content="#ffffff">
 
   <!-- 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 -->
 
   <!-- Choices includes -->
-  <link rel="stylesheet" href="../assets/styles/choices.min.css?version=3.0.2">
-  <script src="../assets/scripts/choices.min.js?version=2.8.8"></script>
+  <link rel="stylesheet" href="../assets/styles/choices.min.css?version=6.0.3">
+  <script src="../assets/scripts/choices.min.js?version=6.0.3"></script>
   <!-- End Choices includes -->
   </head>
 

diff --git a/public/test/text.html b/public/test/text.html
@@ -16,12 +16,12 @@
   <meta name="theme-color" content="#ffffff">
 
   <!-- 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 -->
 
   <!-- Choices includes -->
-  <link rel="stylesheet" href="../assets/styles/choices.min.css?version=3.0.2">
-  <script src="../assets/scripts/choices.min.js?version=2.8.8"></script>
+  <link rel="stylesheet" href="../assets/styles/choices.min.css?version=6.0.3">
+  <script src="../assets/scripts/choices.min.js?version=6.0.3"></script>
   <!-- End Choices includes -->
   </head>
 

diff --git a/src/scripts/choices.js b/src/scripts/choices.js
@@ -1390,7 +1390,7 @@ class Choices {
   _onMouseDown(event) {
     const { target, shiftKey } = event;
     // 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;
     }