Fixes Choices-js#543

Zilus · Feb 10, 2020 · cd8a83b · cd8a83b
1 parent cbaf432
commit cd8a83b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/public/assets/scripts/choices.js b/public/assets/scripts/choices.js
@@ -1,4 +1,4 @@
-/*! choices.js v9.0.1 | © 2019 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
+/*! choices.js v9.0.1 | © 2020 Josh Johnson | https://github.com/jshjohnson/Choices#readme */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -1490,7 +1490,7 @@ function () {
           selected: !!option.selected,
           disabled: option.disabled || option.parentNode.disabled,
           placeholder: option.value === '' || option.hasAttribute('placeholder'),
-          customProperties: option.dataset['custom-properties']
+          customProperties: option.dataset.customProperties
         });
       });
     }
@@ -3276,7 +3276,7 @@ function () {
           isSelected: choice.selected,
           isDisabled: isOptDisabled,
           groupId: groupId,
-          customProperties: choice.customProperties,
+          customProperties: choice.dataset.customProperties,
           placeholder: choice.placeholder
         });
       };
@@ -3577,7 +3577,7 @@ function () {
   };
 
   Choices.prototype._generatePlaceholderValue = function () {
-    if (this._isSelectElement) {
+    if (this._isSelectElement && this.passedElement.placeholderOption) {
       var placeholderOption = this.passedElement.placeholderOption;
       return placeholderOption ? placeholderOption.text : null;
     }

diff --git a/public/assets/scripts/choices.min.js b/public/assets/scripts/choices.min.js
diff --git a/src/scripts/choices.ts b/src/scripts/choices.ts
@@ -255,7 +255,7 @@ class Choices {
           disabled: option.disabled || option.parentNode.disabled,
           placeholder:
             option.value === '' || option.hasAttribute('placeholder'),
-          customProperties: option.dataset['custom-properties'],
+          customProperties: option.dataset.customProperties,
         });
       });
     }
@@ -2060,7 +2060,7 @@ class Choices {
           isSelected: choice.selected,
           isDisabled: isOptDisabled,
           groupId,
-          customProperties: choice.customProperties,
+          customProperties: choice.dataset.customProperties,
           placeholder: choice.placeholder,
         });
       };