deblan-mirror/Choices
deblan-mirror/Choices
1
0
Fork 0
mirror of https://github.com/Choices-js/Choices.git synced 2024-06-01 13:32:23 +02:00
Code Issues Projects Releases Wiki Activity

Resolve conflict

Browse source
This commit is contained in:
Josh Johnson 2017-10-18 08:56:19 +01:00
parent 88ccdc6917 8b71f277ff
commit a77b93b25a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
index.html
View file

@ -490,7 +490,7 @@
var classNames = this.config.classNames; var classNames = this.config.classNames;
var itemSelectText = this.config.itemSelectText; var itemSelectText = this.config.itemSelectText;
return { return {
item: function(data) { item: function(classNames, data) {
return strToEl('\ return strToEl('\
<div\ <div\
class="'+ String(classNames.item) + ' ' + String(data.highlighted ? classNames.highlightedState : classNames.itemSelectable) + '"\ class="'+ String(classNames.item) + ' ' + String(data.highlighted ? classNames.highlightedState : classNames.itemSelectable) + '"\
@ -504,7 +504,7 @@
</div>\ </div>\
'); ');
}, },
choice: function(data) { choice: function(classNames, data) {
return strToEl('\ return strToEl('\
<div\ <div\
class="'+ String(classNames.item) + ' ' + String(classNames.itemChoice) + ' ' + String(data.disabled ? classNames.itemDisabled : classNames.itemSelectable) + '"\ class="'+ String(classNames.item) + ' ' + String(classNames.itemChoice) + ' ' + String(data.disabled ? classNames.itemDisabled : classNames.itemSelectable) + '"\