deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-06-11 10:22:15 +02:00
Code Issues Projects Releases Wiki Activity

Rebase https://github.com/jshjohnson/Choices into pr-custom-templates

Browse source
This commit is contained in:
fabien.leconte 2016-09-30 09:46:27 +02:00
parent c8d508f4de
commit 3ea9fa56a7
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
assets/scripts/dist/choices.js vendored
View file

@ -163,6 +163,7 @@
callbackOnRemoveItem: null, callbackOnRemoveItem: null,
callbackOnHighlightItem: null, callbackOnHighlightItem: null,
callbackOnUnhighlightItem: null, callbackOnUnhighlightItem: null,
callbackOnCreateTemplates: null,
callbackOnChange: null, callbackOnChange: null,
callbackOnSearch: null callbackOnSearch: null
}; };
@ -1006,7 +1007,7 @@
if (this.initialised === true) { if (this.initialised === true) {
if (this.passedElement.type === 'select-one' || this.passedElement.type === 'select-multiple') { if (this.passedElement.type === 'select-one' || this.passedElement.type === 'select-multiple') {
// Show loading text // Show loading text
this._handleLoadingState(); this._handleLoadingState(true);
// Run callback // Run callback
fn(this._ajaxCallback()); fn(this._ajaxCallback());
} }
@ -1563,7 +1564,7 @@
// If backspace or delete key is pressed and the input has no value // If backspace or delete key is pressed and the input has no value
if (hasFocusedInput && !e.target.value && _this17.passedElement.type !== 'select-one') { if (hasFocusedInput && !e.target.value && _this17.passedElement.type !== 'select-one') {
_this17._handleBackspace(activeItems); _this17._handleBackspace(activeItems);
_this17._handleLoadingState(); _this17._handleLoadingState(false);
e.preventDefault(); e.preventDefault();
} }
}; };
@ -2310,7 +2311,15 @@
} }
}; };
this.config.templates = templates; // User's custom templates
var callbackTemplate = this.config.callbackOnCreateTemplates;
var userTemplates = {};
if (callbackTemplate) {
if ((0, _utils.isType)('Function', callbackTemplate)) {
userTemplates = callbackTemplate(this, _utils.strToEl);
}
}
this.config.templates = (0, _utils.extend)(templates, userTemplates);
} }
/** /**

2
assets/scripts/dist/choices.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
assets/scripts/dist/choices.min.js vendored
View file

File diff suppressed because one or more lines are too long