projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roojs-debug.js
[roojs1]
/
roojs-debug.js
diff --git
a/roojs-debug.js
b/roojs-debug.js
index
bbe06a8
..
aa68db2
100644
(file)
--- a/
roojs-debug.js
+++ b/
roojs-debug.js
@@
-38739,8
+38739,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;
@@
-38761,6
+38763,13
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
}
}
+ if (typeof(v) == 'object') {
+ // then let's assume it's an array of objects..
+ Roo.each(v, function(l) {
+ this.addItem(l);
+ }, this);
+
+ }
},
},