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
6c45b59
..
9430666
100644
(file)
--- a/
Roo/form/ComboBoxArray.js
+++ b/
Roo/form/ComboBoxArray.js
@@
-49,8
+49,9
@@
Roo.form.ComboBoxArray = function(config)
}
}
+
-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
@@
-82,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() { },
@@
-91,7
+92,7
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
{
// create the standard hidden element
{
// create the standard hidden element
- Roo.form.ComboBoxArray.superclass.onRender.call(this, ct, position);
+
//
Roo.form.ComboBoxArray.superclass.onRender.call(this, ct, position);
// give fake names to child combo;
// give fake names to child combo;
@@
-112,6
+113,9
@@
Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField
this.hiddenEl = this.combo.wrap.createChild({
tag: 'input', type:'hidden' , name: this.hiddenName, value : ''
this.hiddenEl = this.combo.wrap.createChild({
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");
@@
-119,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');
@@
-167,13
+171,15
@@
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){
+ return;
+ // not sure if this is needed..
this.combo.onResize(w,h);
if(typeof w != 'number'){
this.combo.onResize(w,h);
if(typeof w != 'number'){
@@
-259,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);