projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
35627de
)
Roo/bootstrap/ComboBox.js
author
Michael
<michael@roojs.com>
Wed, 11 Feb 2015 07:48:28 +0000
(15:48 +0800)
committer
Michael
<michael@roojs.com>
Wed, 11 Feb 2015 07:48:28 +0000
(15:48 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
9e0a5cc
..
355cd1d
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-1037,8
+1037,8
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
if(this.multiple){
if(typeof o.display_name !== 'string'){
- for(var
dn in o.display_name
){
- this.addItem({'id':o.id,'display_name':
dn
});
+ for(var
i=0;i<o.display_name.length;i++
){
+ this.addItem({'id':o.id,'display_name':
o.display_name[i]
});
}
}
//this.addItem(o);