projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f5ea56
)
Roo/bootstrap/ComboBox.js
author
Michael
<michael@roojs.com>
Wed, 11 Feb 2015 09:02:09 +0000
(17:02 +0800)
committer
Michael
<michael@roojs.com>
Wed, 11 Feb 2015 09:02:09 +0000
(17:02 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
86e7954
..
a2593c1
100644
(file)
--- a/
Roo/bootstrap/ComboBox.js
+++ b/
Roo/bootstrap/ComboBox.js
@@
-1036,12
+1036,12
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
setFromData : function(o){
if(this.multiple){
- if(typeof o.display_name !== 'string'){
- for(var i=0;i<o.display_name.length;i++){
- this.addItem({'id':o.id[i],'display_name':o.display_name[i]});
- }
- }
-
//
this.addItem(o);
+
//
if(typeof o.display_name !== 'string'){
+
//
for(var i=0;i<o.display_name.length;i++){
+
//
this.addItem({'id':o.id[i],'display_name':o.display_name[i]});
+
//
}
+
//
}
+ this.addItem(o);
return;
}