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
8c0d979
..
9430666
100644
(file)
--- a/
Roo/form/ComboBoxArray.js
+++ b/
Roo/form/ComboBoxArray.js
@@
-49,12
+49,9
@@
Roo.form.ComboBoxArray = function(config)
}
}
- Roo.extend(Roo.form.Hidden, Roo.form.TextField, {
-
-
-});
-Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
+
+Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
,
{
/**
* @cfg {Roo.form.Combo} combo The combo box that is wrapped
{
/**
* @cfg {Roo.form.Combo} combo The combo box that is wrapped
@@
-86,7
+83,7
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
// private - the hidden field el.
hiddenEl : false,
// private - the hidden field el.
hiddenEl : false,
- boxWidth : 200, // use to set the box around the entry..
+ el : false,
//validateValue : function() { return true; }, // all values are ok!
//onAddClick: function() { },
//validateValue : function() { return true; }, // all values are ok!
//onAddClick: function() { },
@@
-94,9
+91,11
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
onRender : function(ct, position)
{
onRender : function(ct, position)
{
- //
give fake names to child combo;
- Roo.form.ComboBoxArray.superclass.onRender.call(this, ct, position);
+ //
create the standard hidden element
+
//
Roo.form.ComboBoxArray.superclass.onRender.call(this, ct, position);
+
+ // give fake names to child combo;
this.combo.hiddenName = this.hiddenName ? (this.hiddenName+'-subcombo') : this.hiddenName;
this.combo.name = this.name? (this.name+'-subcombo') : this.name;
this.combo.hiddenName = this.hiddenName ? (this.hiddenName+'-subcombo') : this.hiddenName;
this.combo.name = this.name? (this.name+'-subcombo') : this.name;
@@
-113,7
+112,10
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
this.hiddenEl = this.combo.wrap.createChild({
this.hiddenEl = this.combo.wrap.createChild({
- tag: 'input', type:'hidden' , name: this.hiddenListName, value : ''
+ tag: 'input', type:'hidden' , name: this.hiddenName, value : ''
+ });
+ this.el = this.combo.wrap.createChild({
+ tag: 'input', type:'hidden' , name: this.name, value : ''
});
// this.el.dom.removeAttribute("name");
});
// this.el.dom.removeAttribute("name");
@@
-121,12
+123,12
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
this.outerWrap = this.combo.wrap;
this.wrap = cbwrap;
this.outerWrap = this.combo.wrap;
this.wrap = cbwrap;
- this.outerWrap.setWidth(this.
boxW
idth);
+ this.outerWrap.setWidth(this.
w
idth);
this.outerWrap.dom.removeChild(this.el.dom);
this.wrap.dom.appendChild(this.el.dom);
this.outerWrap.dom.removeChild(this.el.dom);
this.wrap.dom.appendChild(this.el.dom);
- this.outerWrap.dom.removeChild(this.trigger.dom);
- this.combo.wrap.dom.appendChild(this.trigger.dom);
+ this.outerWrap.dom.removeChild(this.
combo.
trigger.dom);
+ this.combo.wrap.dom.appendChild(this.
combo.
trigger.dom);
this.combo.trigger.setStyle('position','relative');
this.combo.trigger.setStyle('left', '0px');
this.combo.trigger.setStyle('position','relative');
this.combo.trigger.setStyle('left', '0px');
@@
-169,28
+171,31
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
{
// returns hidden if it's set..
if (!this.rendered) {return ''};
{
// returns hidden if it's set..
if (!this.rendered) {return ''};
- return this.hidden
ListN
ame;
+ return this.hidden
Name ? this.hiddenName : this.n
ame;
},
onResize: function(w, h){
},
onResize: function(w, h){
- Roo.form.ComboBox.superclass.onResize.apply(this, arguments);
+
+ return;
+ // not sure if this is needed..
+ this.combo.onResize(w,h);
if(typeof w != 'number'){
// we do not handle it!?!?
return;
}
if(typeof w != 'number'){
// we do not handle it!?!?
return;
}
- var tw = this.trigger.getWidth();
+ var tw = this.
combo.
trigger.getWidth();
tw += this.addicon ? this.addicon.getWidth() : 0;
tw += this.editicon ? this.editicon.getWidth() : 0;
var x = w - tw;
tw += this.addicon ? this.addicon.getWidth() : 0;
tw += this.editicon ? this.editicon.getWidth() : 0;
var x = w - tw;
- this.
el.setWidth( this
.adjustWidth('input', x));
+ this.
combo.el.setWidth( this.combo
.adjustWidth('input', x));
- this.trigger.setStyle('left', '0px');
+ this.
combo.
trigger.setStyle('left', '0px');
if(this.list && this.listWidth === undefined){
if(this.list && this.listWidth === undefined){
- var lw = Math.max(x + this.
trigger.getWidth(), this
.minListWidth);
+ var lw = Math.max(x + this.
combo.trigger.getWidth(), this.combo
.minListWidth);
this.list.setWidth(lw);
this.innerList.setWidth(lw - this.list.getFrameWidth('lr'));
}
this.list.setWidth(lw);
this.innerList.setWidth(lw - this.list.getFrameWidth('lr'));
}
@@
-201,7
+206,9
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
addItem: function(rec)
{
addItem: function(rec)
{
- if (this.items.indexOfKey(rec[this.idField]) > -1) {
+ var idField = this.combo.valueField;
+ var displayField = this.combo.displayField;
+ if (this.items.indexOfKey(rec[idField]) > -1) {
//console.log("GOT " + rec.data.id);
return;
}
//console.log("GOT " + rec.data.id);
return;
}
@@
-209,12
+216,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,
- nameField :
this.nameField
,
- tipField :
this.tipField
,
+ nameField :
displayField
,
+ tipField :
displayField
,
cb : this
});
// use the
cb : this
});
// use the
- this.items.add(rec[
this.
idField],x);
+ this.items.add(rec[idField],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);
@@
-228,7
+235,8
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
return;
}
var ar = [];
return;
}
var ar = [];
- var idField = this.idField;
+ var idField = this.combo.valueField;
+
this.items.each(function(f) {
ar.push(f.data[idField]);
this.items.each(function(f) {
ar.push(f.data[idField]);
@@
-257,6
+265,10
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
if (typeof(v) != 'object') {
return;
}
if (typeof(v) != 'object') {
return;
}
+ Roo.log(v);
+ Roo.log(this.hiddenEl.dom.value);
+ Roo.log(this.el.dom.value);
+
var _this = this;
Roo.each(v, function(l) {
_this.addItem(l);
var _this = this;
Roo.each(v, function(l) {
_this.addItem(l);
@@
-291,25
+303,46
@@
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,
- defaultAutoCreate : {tag: 'div', cls: 'x-cbarray-item', cn : [
+ nameField : false,
+ tipField : false,
+
+
+ defaultAutoCreate : {
+ tag: 'div',
+ cls: 'x-cbarray-item',
+ cn : [
{ tag: 'div' },
{ tag: 'div' },
- { tag: 'img', width:16, height : 16, src : Roo.BLANK_IMAGE_URL , align: 'center' }
+ {
+ tag: 'img',
+ width:16,
+ height : 16,
+ src : Roo.BLANK_IMAGE_URL ,
+ align: 'center'
+ }
]
},
]
},
- onRender : function(ct, position){
+ onRender : function(ct, position)
+ {
Roo.form.Field.superclass.onRender.call(this, ct, position);
Roo.form.Field.superclass.onRender.call(this, ct, position);
+
if(!this.el){
var cfg = this.getAutoCreate();
this.el = ct.createChild(cfg, position);
}
if(!this.el){
var cfg = this.getAutoCreate();
this.el = ct.createChild(cfg, position);
}
+
this.el.child('img').dom.setAttribute('src', Roo.BLANK_IMAGE_URL);
this.el.child('div').dom.innerHTML = this.cb.renderer ?
this.el.child('img').dom.setAttribute('src', Roo.BLANK_IMAGE_URL);
this.el.child('div').dom.innerHTML = this.cb.renderer ?
- this.cb.renderer(this.data) : String.format('{0}',this.data[this.nameField]);
- this.el.child('div').dom.setAttribute('qtip', String.format('{0}',this.data[this.tipField]));
+ this.cb.renderer(this.data) :
+ String.format('{0}',this.data[this.nameField]);
+
+
+ this.el.child('div').dom.setAttribute('qtip',
+ String.format('{0}',this.data[this.tipField])
+ );
this.el.child('img').on('click', this.remove, this);
this.el.child('img').on('click', this.remove, this);