projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79a739c
)
Roo/form/ComboBoxArray.js
author
Alan Knowles
<alan@roojs.com>
Wed, 2 May 2012 07:05:02 +0000
(15:05 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 2 May 2012 07:05:02 +0000
(15:05 +0800)
Roo/form/ComboBoxArray.js
patch
|
blob
|
history
diff --git
a/Roo/form/ComboBoxArray.js
b/Roo/form/ComboBoxArray.js
index
95e0817
..
f923cb0
100644
(file)
--- a/
Roo/form/ComboBoxArray.js
+++ b/
Roo/form/ComboBoxArray.js
@@
-211,9
+211,9
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
addItem: function(rec)
{
addItem: function(rec)
{
- var
id
Field = this.combo.valueField;
+ var
value
Field = this.combo.valueField;
var displayField = this.combo.displayField;
var displayField = this.combo.displayField;
- if (this.items.indexOfKey(rec[
id
Field]) > -1) {
+ if (this.items.indexOfKey(rec[
value
Field]) > -1) {
//console.log("GOT " + rec.data.id);
return;
}
//console.log("GOT " + rec.data.id);
return;
}
@@
-221,12
+221,12
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
var x = new Roo.form.ComboBoxArray.Item({
//id : rec[this.idField],
data : rec,
var x = new Roo.form.ComboBoxArray.Item({
//id : rec[this.idField],
data : rec,
-
name
Field : displayField ,
+
display
Field : displayField ,
tipField : displayField ,
cb : this
});
// use the
tipField : displayField ,
cb : this
});
// use the
- this.items.add(rec[
id
Field],x);
+ this.items.add(rec[
value
Field],x);
// add it before the element..
this.updateHiddenEl();
x.render(this.outerWrap, this.wrap.dom);
// add it before the element..
this.updateHiddenEl();
x.render(this.outerWrap, this.wrap.dom);
@@
-338,7
+338,7
@@
Roo.form.ComboBoxArray.Item = function(config) {
Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
data : {},
cb: false,
Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
data : {},
cb: false,
-
name
Field : false,
+
display
Field : false,
tipField : false,
tipField : false,
@@
-372,7
+372,7
@@
Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
this.el.child('div').dom.innerHTML = this.cb.renderer ?
this.cb.renderer(this.data) :
this.el.child('div').dom.innerHTML = this.cb.renderer ?
this.cb.renderer(this.data) :
- String.format('{0}',this.data[this.
name
Field]);
+ String.format('{0}',this.data[this.
display
Field]);
this.el.child('div').dom.setAttribute('qtip',
this.el.child('div').dom.setAttribute('qtip',