projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/form/ComboBoxArray.js
[roojs1]
/
Roo
/
form
/
ComboBoxArray.js
diff --git
a/Roo/form/ComboBoxArray.js
b/Roo/form/ComboBoxArray.js
index
8dd327a
..
f060e0c
100644
(file)
--- a/
Roo/form/ComboBoxArray.js
+++ b/
Roo/form/ComboBoxArray.js
@@
-270,8
+270,10
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
{
this.reset();
{
this.reset();
-
- if (this.store.isLocal) {
+
+
+
+ if (this.store.isLocal && (typeof(v) == 'string')) {
// then we can use the store to find the values..
// comma seperated at present.. this needs to allow JSON based encoding..
this.hiddenEl.value = v;
// then we can use the store to find the values..
// comma seperated at present.. this needs to allow JSON based encoding..
this.hiddenEl.value = v;
@@
-288,9
+290,14
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
this.addItem(add);
}, this)
this.addItem(add);
}, this)
-
-
-
+
+ }
+ if (typeof(v) == 'object') {
+ // then let's assume it's an array of objects..
+ Roo.each(v, function(l) {
+ this.addItem(l);
+ }, this);
+
}
}
@@
-301,7
+308,7
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
this.reset();
this.el.dom.value = v[this.displayField];
this.hiddenEl.dom.value = v[this.valueField];
this.reset();
this.el.dom.value = v[this.displayField];
this.hiddenEl.dom.value = v[this.valueField];
- if (!v[this.valueField].length) {
+ if (
typeof(v[this.valueField]) != 'string' ||
!v[this.valueField].length) {
return;
}
var keys = v[this.valueField].split(',');
return;
}
var keys = v[this.valueField].split(',');