git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.3.1 - Released 11/30/2010
[extjs.git]
/
src
/
widgets
/
form
/
CompositeField.js
diff --git
a/src/widgets/form/CompositeField.js
b/src/widgets/form/CompositeField.js
index
0301075
..
976acee
100644
(file)
--- a/
src/widgets/form/CompositeField.js
+++ b/
src/widgets/form/CompositeField.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.3.
0
- * Copyright(c) 2006-2010
Ext JS,
Inc.
- * licensing@
extjs
.com
- * http://www.
extjs
.com/license
+ * Ext JS Library 3.3.
1
+ * Copyright(c) 2006-2010
Sencha
Inc.
+ * licensing@
sencha
.com
+ * http://www.
sencha
.com/license
*/
/**
* @class Ext.form.CompositeField
*/
/**
* @class Ext.form.CompositeField
@@
-91,6
+91,10
@@
Ext.form.CompositeField = Ext.extend(Ext.form.Field, {
for (var i=0, j = items.length; i < j; i++) {
item = items[i];
for (var i=0, j = items.length; i < j; i++) {
item = items[i];
+
+ if (!Ext.isEmpty(item.ref)){
+ item.ref = '../' + item.ref;
+ }
labels.push(item.fieldLabel);
labels.push(item.fieldLabel);
@@
-129,8
+133,10
@@
Ext.form.CompositeField = Ext.extend(Ext.form.Field, {
layout : 'hbox',
items : this.items,
cls : 'x-form-composite',
layout : 'hbox',
items : this.items,
cls : 'x-form-composite',
- defaultMargins: '0 3 0 0'
+ defaultMargins: '0 3 0 0',
+ ownerCt: this
});
});
+ this.innerCt.ownerCt = undefined;
var fields = this.innerCt.findBy(function(c) {
return c.isFormField;
var fields = this.innerCt.findBy(function(c) {
return c.isFormField;