cbind mixin: also descend in elements with an cbind property
Not only into those with an xtype one, as we can either have a implicit default xtype (e.g., in tbars for buttons, or set explicitly via the `defaults` mechanism) or want to apply cbinds to stores or other objects. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
f5853d4605
commit
5995eddcc4
@ -88,7 +88,7 @@ Ext.define('Proxmox.Mixin.CBind', {
|
||||
found = false;
|
||||
for (i = 0; i < arrayLength; i++) {
|
||||
el = org[i];
|
||||
if (el.constructor === Object && el.xtype) {
|
||||
if (el.constructor === Object && (el.xtype || el.cbind)) {
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
@ -99,7 +99,7 @@ Ext.define('Proxmox.Mixin.CBind', {
|
||||
copy = [];
|
||||
for (i = 0; i < arrayLength; i++) {
|
||||
el = org[i];
|
||||
if (el.constructor === Object && el.xtype) {
|
||||
if (el.constructor === Object && (el.xtype || el.cbind)) {
|
||||
elcopy = cloneTemplateObject(el);
|
||||
if (elcopy.cbind) {
|
||||
applyCBind(elcopy);
|
||||
@ -123,7 +123,7 @@ Ext.define('Proxmox.Mixin.CBind', {
|
||||
res[prop] = el;
|
||||
continue;
|
||||
}
|
||||
if (el.constructor === Object && el.xtype) {
|
||||
if (el.constructor === Object && (el.xtype || el.cbind)) {
|
||||
copy = cloneTemplateObject(el);
|
||||
if (copy.cbind) {
|
||||
applyCBind(copy);
|
||||
@ -146,7 +146,7 @@ Ext.define('Proxmox.Mixin.CBind', {
|
||||
el = me[prop];
|
||||
if (el === undefined || el === null) continue;
|
||||
if (typeof el === 'object' && el.constructor === Object) {
|
||||
if (el.xtype && prop !== 'config') {
|
||||
if ((el.xtype || el.cbind) && prop !== 'config') {
|
||||
me[prop] = cloneTemplateObject(el);
|
||||
}
|
||||
} else if (el.constructor === Array) {
|
||||
|
Loading…
Reference in New Issue
Block a user