projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0b03d4b
)
Roo/bootstrap/ComboBox.js
author
edward
<edward@roojs.com>
Mon, 25 Apr 2016 05:47:17 +0000
(13:47 +0800)
committer
edward
<edward@roojs.com>
Mon, 25 Apr 2016 05:47:17 +0000
(13:47 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
f8aa32a
..
e206957
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-2314,14
+2314,16
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
this.store.data.each(function(d, rowIndex){
var row = this.touchViewListGroup.createChild(template);
this.store.data.each(function(d, rowIndex){
var row = this.touchViewListGroup.createChild(template);
-
-
if(this.displayField && typeof(d.data[this.displayField]) != 'undefined'){
if(this.displayField && typeof(d.data[this.displayField]) != 'undefined'){
- row.select('.roo-combobox-list-group-item-value', true).first().dom.innerHTML = d.data[this.displayField];
+ var cfg = {
+ html : d.data[this.displayField]
+ }
+
+ if(this.fireEvent('touchviewdisplay', this, cfg) !== false){
+ row.select('.roo-combobox-list-group-item-value', true).first().dom.innerHTML = cfg.html;
+ }
}
}
-
-
if(!this.multiple && this.valueField && typeof(d.data[this.valueField]) != 'undefined' && d.data[this.valueField] == this.getValue()){
row.select('.roo-combobox-list-group-item-box > input', true).first().attr('checked', true);
}
if(!this.multiple && this.valueField && typeof(d.data[this.valueField]) != 'undefined' && d.data[this.valueField] == this.getValue()){
row.select('.roo-combobox-list-group-item-box > input', true).first().attr('checked', true);
}