Minor tweaks

This commit is contained in:
Josh Johnson 2018-05-25 08:53:58 +01:00
parent 25309c91fc
commit 478df0fac1
4 changed files with 378 additions and 481 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

2
src/scripts/dist/choices.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -104,10 +104,8 @@ class Choices {
);
}
// Set unique base Id
this._baseId = generateId(this.passedElement.element, 'choices-');
this.idNames = {
this._idNames = {
itemChoice: 'item-choice',
};
@ -1900,7 +1898,7 @@ class Choices {
const choices = this._store.choices;
const choiceLabel = label || value;
const choiceId = choices ? choices.length + 1 : 1;
const choiceElementId = `${this._baseId}-${this.idNames.itemChoice}-${choiceId}`;
const choiceElementId = `${this._baseId}-${this._idNames.itemChoice}-${choiceId}`;
this._store.dispatch(
addChoice(
@ -2001,8 +1999,10 @@ class Choices {
if (!template) {
return null;
}
const templates = this.config.templates;
const globalClasses = this.config.classNames;
return templates[template].call(this, globalClasses, ...args);
}
@ -2012,11 +2012,11 @@ class Choices {
* @private
*/
_createTemplates() {
// User's custom templates
const callbackTemplate = this.config.callbackOnCreateTemplates;
const { callbackOnCreateTemplates } = this.config;
let userTemplates = {};
if (callbackTemplate && isType('Function', callbackTemplate)) {
userTemplates = callbackTemplate.call(this, strToEl);
if (callbackOnCreateTemplates && isType('Function', callbackOnCreateTemplates)) {
userTemplates = callbackOnCreateTemplates.call(this, strToEl);
}
this.config.templates = extend(TEMPLATES, userTemplates);